Explorar el Código

Bluetooth: hci_ll: Fix NULL pointer deref on FW upload failure

Avoid NULL pointer dereference occurring due to freeing
skb containing an error pointer. It can easily be triggered
by using the driver with broken uart (i.e. due to misconfigured
pinmuxing).

Fixes: 371805522f87 ("bluetooth: hci_uart: add LL protocol serdev driver support")
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Sebastian Reichel hace 8 años
padre
commit
f2edd9f67b
Se han modificado 1 ficheros con 1 adiciones y 2 borrados
  1. 1 2
      drivers/bluetooth/hci_ll.c

+ 1 - 2
drivers/bluetooth/hci_ll.c

@@ -537,8 +537,7 @@ static int read_local_version(struct hci_dev *hdev)
 	if (IS_ERR(skb)) {
 	if (IS_ERR(skb)) {
 		bt_dev_err(hdev, "Reading TI version information failed (%ld)",
 		bt_dev_err(hdev, "Reading TI version information failed (%ld)",
 			   PTR_ERR(skb));
 			   PTR_ERR(skb));
-		err = PTR_ERR(skb);
-		goto out;
+		return PTR_ERR(skb);
 	}
 	}
 	if (skb->len != sizeof(*ver)) {
 	if (skb->len != sizeof(*ver)) {
 		err = -EILSEQ;
 		err = -EILSEQ;