[PATCH 4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

[PATCH 4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

[Wentao Guan]

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(-)

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);
-- 
2.20.1

RE: [4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

This is an automated email and please do not reply to this email.

Dear Submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.

----- Output -----

error: patch failed: net/bluetooth/hci_event.c:5402
error: net/bluetooth/hci_event.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch

Please resolve the issue and submit the patches again.


---
Regards,
Linux Bluetooth

Re: [PATCH 4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

[Greg KH]

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