diff mbox series

[4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

Message ID 20240705100106.25403-1-guanwentao@uniontech.com
State New
Headers show
Series [4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt | expand

Commit Message

Wentao Guan July 5, 2024, 10:01 a.m. UTC 
From: Jaganath Kanakkassery <jaganath.k.os@gmail.com>

Please apply the upstream commit:
commit cd9151b618da ("Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt")
 
Solved kernel BT Err  "Bluetooth: Unknown advertising packet type: 0x100"

-------------------------------------------------------------------------

In ext_adv_report_event rssi comes before data (not after data as
in legacy adv_report_evt) so "+ 1" is not required in the ptr arithmatic
to point to next report.

Cc: stable@vger.kernel.org # 4.19-
Signed-off-by: Jaganath Kanakkassery <jaganath.kanakkassery@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
---
 net/bluetooth/hci_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

gregkh@linuxfoundation.org July 8, 2024, 12:38 p.m. UTC | #1 
On Fri, Jul 05, 2024 at 06:01:06PM +0800, Wentao Guan wrote:
> From: Jaganath Kanakkassery <jaganath.k.os@gmail.com>
> 
> Please apply the upstream commit:
> commit cd9151b618da ("Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt")
>  
> Solved kernel BT Err  "Bluetooth: Unknown advertising packet type: 0x100"

Now queued up, thanks!

greg k-h
diff mbox series

Patch

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3e7badb3ac2d..4f972c9e9dbe 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5402,7 +5402,7 @@  static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
 					   ev->data, ev->length);
 		}
 
-		ptr += sizeof(*ev) + ev->length + 1;
+		ptr += sizeof(*ev) + ev->length;
 	}
 
 	hci_dev_unlock(hdev);