2020-04-08 05:31:35

by Sathish Narasimman

Subject: [PATCH] bluetooth: btusb: check for NULL in btusb_find_altsetting()

The new btusb_find_altsetting() dereferences it without checking
the check is added in this patch

Signed-off-by: Sathish Narasimman <[email protected]>
---
drivers/bluetooth/btusb.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 110e96b245e5..2e715a6232dc 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1622,6 +1622,9 @@ static struct usb_host_interface *btusb_find_altsetting(struct btusb_data *data,

BT_DBG("Looking for Alt no :%d", alt);

+ if (!intf)
+ return NULL;
+
for (i = 0; i < intf->num_altsetting; i++) {
if (intf->altsetting[i].desc.bAlternateSetting == alt)
return &intf->altsetting[i];
--
2.17.1

2020-04-08 06:17:49

by Marcel Holtmann

Subject: Re: [PATCH] bluetooth: btusb: check for NULL in btusb_find_altsetting()

Hi Satish,

> The new btusb_find_altsetting() dereferences it without checking
> the check is added in this patch
>
> Signed-off-by: Sathish Narasimman <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 3 +++
> 1 file changed, 3 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel