Skip to contentSkip to conversation

Bluetooth: hci_sync: unlock on error in hci_inquiry_result_with_rssi_evt()

PATCH In review Dan Carpenter 3 participants 3 messages Jan 11, 2022 – Jan 21, 2022

Subsystems (3)
Bluetooth drivers Kernel janitors Bluetooth
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 Bluetooth: hci_sync: unlock on error in hci_inquiry_result_with_rssi_evt()

Add unlocks to two error paths in hci_inquiry_result_with_rssi_evt().

Fixes fee645033e2c ("Bluetooth: hci_event: Use skb_pull_data when processing inquiry results")
Signed-off-by Dan Carpenter <[email protected]>
---
 net/bluetooth/hci_event.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
net/bluetooth/hci_event.c +3 -3
index f1082b7c0218..e6c75cb1c7fe 100644
@@ -4536,7 +4536,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 			if (!info) {
 				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
-				return;
+				goto unlock;
 			}
 
 			bacpy(&data.bdaddr, &info->bdaddr);

@@ -4566,7 +4566,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 			if (!info) {
 				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
-				return;
+				goto unlock;
 			}
 
 			bacpy(&data.bdaddr, &info->bdaddr);

@@ -4588,7 +4588,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 		bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 			   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
 	}
-
+unlock:
 	hci_dev_unlock(hdev);
 }
Signature · 1 line
2.20.1
maintainer
#1 lore raw

Hi Dan,

Quoted 7 lines

Add unlocks to two error paths in hci_inquiry_result_with_rssi_evt().

Fixes fee645033e2c ("Bluetooth: hci_event: Use skb_pull_data when processing inquiry results")
Signed-off-by Dan Carpenter <[email protected]>

---
net/bluetooth/hci_event.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

patch doesn’t apply cleanly, please rebase against bluetooth-next tree.

Regards

Marcel

maintainer
#2 lore raw

Hi Marcel,

Quoted 11 lines · Marcel Holtmann

Hi Dan,

Quoted 7 lines

Add unlocks to two error paths in hci_inquiry_result_with_rssi_evt().

Fixes fee645033e2c ("Bluetooth: hci_event: Use skb_pull_data when processing inquiry results")
Signed-off-by Dan Carpenter <[email protected]>

---
net/bluetooth/hci_event.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 5 lines

patch doesn’t apply cleanly, please rebase against bluetooth-next tree.

Regards

Marcel

Ive already applied this one:

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=c07ba878ca199a6089cdb323bf526adbeeb4201f

Might have forgotten to reply here.

Signature · 1 line
Luiz Augusto von Dentz