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: <20200305152839.92437-1-marcel@holtmann.org>
In-Reply-To: <20200305152839.92437-1-marcel@holtmann.org>
From:   Alain Michaud <alainmichaud@google.com>
Date:   Thu, 5 Mar 2020 11:17:45 -0500
Message-ID: <CALWDO_VPZ_E4KnuWoVMEw6=+X4gOsC5Pq+r46i1f6OSdquSbBQ@mail.gmail.com>
Subject: Re: [PATCH] Bluetooth: Fix calculation of SCO handle for packet processing
To:     Marcel Holtmann <marcel@holtmann.org>
Cc:     BlueZ <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi Marcel,

On Thu, Mar 5, 2020 at 10:28 AM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> When processing SCO packets, the handle is wrongly assumed as 16-bit
> value. The actual size is 12-bits and the other 4-bits are used for
> packet flags.
>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  net/bluetooth/hci_core.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 4e6d61a95b20..6a88954e67c0 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -4387,13 +4387,16 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
>  {
>         struct hci_sco_hdr *hdr = (void *) skb->data;
>         struct hci_conn *conn;
> -       __u16 handle;
> +       __u16 handle, flags;
>
>         skb_pull(skb, HCI_SCO_HDR_SIZE);
>
>         handle = __le16_to_cpu(hdr->handle);
> +       flags  = hci_flags(handle);
> +       handle = hci_handle(handle);
>
> -       BT_DBG("%s len %d handle 0x%4.4x", hdev->name, skb->len, handle);
> +       BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev->name, skb->len,
> +              handle, flags);
>
>         hdev->stat.sco_rx++;
>
> --
> 2.24.1
>

LGTM.