This is a note to let you know that I've just added the patch titled
Bluetooth: hci_event: Fix coding style
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-hci_event-fix-coding-style.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 35d91d95a0cd61ebb90e0246dc917fd25e519b8c Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Date: Thu, 5 Oct 2023 14:12:19 -0700
Subject: Bluetooth: hci_event: Fix coding style
From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
commit 35d91d95a0cd61ebb90e0246dc917fd25e519b8c upstream.
This fixes the following code style problem:
ERROR: that open brace { should be on the previous line
+ if (!bacmp(&hdev->bdaddr, &ev->bdaddr))
+ {
Fixes: 1ffc6f8cc332 ("Bluetooth: Reject connection with the device which has same BD_ADDR")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/hci_event.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3280,8 +3280,7 @@ static void hci_conn_request_evt(struct
/* Reject incoming connection from device with same BD ADDR against
* CVE-2020-26555
*/
- if (!bacmp(&hdev->bdaddr, &ev->bdaddr))
- {
+ if (!bacmp(&hdev->bdaddr, &ev->bdaddr)) {
bt_dev_dbg(hdev, "Reject connection with same BD_ADDR %pMR\n",
&ev->bdaddr);
hci_reject_conn(hdev, &ev->bdaddr);
Patches currently in stable-queue which might be from luiz.von.dentz@xxxxxxxxx are
queue-6.1/bluetooth-hci_event-ignore-null-link-key.patch
queue-6.1/bluetooth-avoid-memcmp-out-of-bounds-warning.patch
queue-6.1/bluetooth-fix-a-refcnt-underflow-problem-for-hci_conn.patch
queue-6.1/bluetooth-reject-connection-with-the-device-which-has-same-bd_addr.patch
queue-6.1/bluetooth-vhci-fix-race-when-opening-vhci-device.patch
queue-6.1/bluetooth-hci_event-fix-coding-style.patch
