| Message ID | 20220111072319.GH11243@kili |
|---|---|
| State | Accepted |
| Commit | c07ba878ca199a6089cdb323bf526adbeeb4201f |
| Headers | show |
| Series | Bluetooth: hci_sync: unlock on error in hci_inquiry_result_with_rssi_evt() | expand |
Hi Dan, > 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 <dan.carpenter@oracle.com> > --- > 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
Hi Marcel, On Fri, Jan 21, 2022 at 2:53 PM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Dan, > > > 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 <dan.carpenter@oracle.com> > > --- > > 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 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.
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index f1082b7c0218..e6c75cb1c7fe 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -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); }
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 <dan.carpenter@oracle.com> --- net/bluetooth/hci_event.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)