Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20200407211202.1008128-1-marcel@holtmann.org>
In-Reply-To: <20200407211202.1008128-1-marcel@holtmann.org>
From:   Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Date:   Tue, 7 Apr 2020 16:36:34 -0700
Message-ID: <CANFp7mVOgoyM1HXPMbFwOuOopaizf6Dt_qd=-ghaoXhjkXAy=g@mail.gmail.com>
Subject: Re: [PATCH] Bluetooth: Translate additional address type correctly
To:     Marcel Holtmann <marcel@holtmann.org>
Cc:     Bluez mailing list <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi Marcel,

On Tue, Apr 7, 2020 at 2:12 PM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> When using controller based address resolution, then the new address
> types 0x02 and 0x03 are used. These types need to be converted back into
> either public address or random address types.
>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  include/net/bluetooth/hci.h | 6 ++++--
>  net/bluetooth/hci_core.c    | 9 +++++++++
>  2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 58360538d42b..74896536ebce 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -2257,8 +2257,10 @@ struct hci_ev_le_conn_complete {
>  #define LE_EXT_ADV_SCAN_RSP            0x0008
>  #define LE_EXT_ADV_LEGACY_PDU          0x0010
>
> -#define ADDR_LE_DEV_PUBLIC     0x00
> -#define ADDR_LE_DEV_RANDOM     0x01
> +#define ADDR_LE_DEV_PUBLIC             0x00
> +#define ADDR_LE_DEV_RANDOM             0x01
> +#define ADDR_LE_DEV_PUBLIC_RESOLVED    0x02
> +#define ADDR_LE_DEV_RANDOM_RESOLVED    0x03
>
>  #define HCI_EV_LE_ADVERTISING_REPORT   0x02
>  struct hci_ev_le_advertising_info {
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 589c4085499c..fb210f7ab7ab 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -3145,6 +3145,15 @@ struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,
>  {
>         struct hci_conn_params *param;
>
> +       switch (addr_type) {
> +       case ADDR_LE_DEV_PUBLIC_RESOLVED:
> +               addr_type = ADDR_LE_DEV_PUBLIC;
> +               break;
> +       case ADDR_LE_DEV_RANDOM:

This seems to be a typo. Should it be `case ADDR_LE_DEV_RANDOM_RESOLVED`?

> +               addr_type = ADDR_LE_DEV_RANDOM;
> +               break;
> +       }
> +
>         list_for_each_entry(param, list, action) {
>                 if (bacmp(&param->addr, addr) == 0 &&
>                     param->addr_type == addr_type)
> --
> 2.25.2
>