From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@intel.com>,
Sasha Levin <sashal@kernel.org>,
linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 10/26] Bluetooth: Fix calculation of SCO handle for packet processing
Date: Sat, 11 Apr 2020 19:13:57 -0400 [thread overview]
Message-ID: <20200411231413.26911-10-sashal@kernel.org> (raw)
In-Reply-To: <20200411231413.26911-1-sashal@kernel.org>
From: Marcel Holtmann <marcel@holtmann.org>
[ Upstream commit debdedf2eb5a2d9777cabff40900772be13cd9f9 ]
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>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.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 a70b078ceb3ca..0161bdbda71ec 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -4043,13 +4043,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.20.1
next prev parent reply other threads:[~2020-04-11 23:17 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 23:13 [PATCH AUTOSEL 4.9 01/26] net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware Sasha Levin
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 02/26] net: phy: probe PHY drivers synchronously Sasha Levin
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 04/26] net: phy: mscc: accept all RGMII species in vsc85xx_mac_if_set Sasha Levin
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 06/26] mwifiex: set needed_headroom, not hard_header_len Sasha Levin
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 07/26] Bluetooth: L2CAP: handle l2cap config request during open state Sasha Levin
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 09/26] net/mlx5e: Init ethtool steering for representors Sasha Levin
2020-04-12 7:10 ` Or Gerlitz
2020-04-12 17:59 ` Jakub Kicinski
2020-04-12 18:29 ` Or Gerlitz
2020-04-14 1:56 ` Sasha Levin
2020-04-14 7:16 ` Leon Romanovsky
2020-04-14 10:22 ` Or Gerlitz
2020-04-14 11:09 ` Greg KH
2020-04-14 14:38 ` Or Gerlitz
2020-04-14 15:16 ` Sasha Levin
2020-04-14 15:49 ` Edward Cree
2020-04-14 17:37 ` Leon Romanovsky
2020-04-14 19:03 ` Jakub Kicinski
2020-04-14 21:00 ` Sasha Levin
2020-04-14 22:50 ` Michal Kubecek
2020-04-15 5:31 ` Leon Romanovsky
2020-04-15 14:07 ` Sasha Levin
2020-04-14 20:57 ` Sasha Levin
2020-04-15 16:18 ` Edward Cree
2020-04-16 0:00 ` Sasha Levin
2020-04-16 4:08 ` Saeed Mahameed
2020-04-16 5:24 ` Leon Romanovsky
2020-04-16 13:30 ` Sasha Levin
2020-04-16 19:07 ` Saeed Mahameed
2020-04-16 19:58 ` Sasha Levin
2020-04-16 21:08 ` Saeed Mahameed
2020-04-17 8:28 ` gregkh
2020-04-17 22:23 ` Saeed Mahameed
2020-04-18 10:51 ` gregkh
2020-04-17 13:21 ` Sasha Levin
2020-04-17 22:38 ` Saeed Mahameed
2020-04-16 13:40 ` Or Gerlitz
2020-04-16 14:04 ` Sasha Levin
2020-04-16 14:17 ` Or Gerlitz
2020-04-16 14:36 ` Sasha Levin
2020-04-16 17:20 ` Greg KH
2020-04-16 19:31 ` Saeed Mahameed
2020-04-16 19:53 ` Sasha Levin
2020-04-16 21:32 ` Saeed Mahameed
2020-04-16 23:23 ` Sasha Levin
2020-04-21 3:07 ` Saeed Mahameed
2020-04-16 20:08 ` Jakub Kicinski
2020-04-16 21:11 ` Saeed Mahameed
2020-04-17 8:25 ` gregkh
2020-04-16 16:06 ` Edward Cree
2020-04-16 18:49 ` Sasha Levin
2020-04-20 11:45 ` Edward Cree
2020-04-20 12:53 ` Sasha Levin
2020-04-11 23:13 ` Sasha Levin [this message]
2020-04-11 23:13 ` [PATCH AUTOSEL 4.9 11/26] Bluetooth: guard against controllers sending zero'd events Sasha Levin
2020-04-11 23:14 ` [PATCH AUTOSEL 4.9 13/26] net: intel: e1000e: fix possible sleep-in-atomic-context bugs in e1000e_get_hw_semaphore() Sasha Levin
2020-04-11 23:14 ` [PATCH AUTOSEL 4.9 19/26] Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl Sasha Levin
2020-04-11 23:14 ` [PATCH AUTOSEL 4.9 20/26] brcmfmac: Fix driver crash on USB control transfer timeout Sasha Levin
2020-04-11 23:14 ` [PATCH AUTOSEL 4.9 26/26] svcrdma: Fix leak of transport addresses Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200411231413.26911-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=johan.hedberg@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).