]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Bluetooth: hci_ll: Fix NULL pointer deref on FW upload failure
authorSebastian Reichel <sre@kernel.org>
Sat, 15 Apr 2017 21:54:13 +0000 (23:54 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 22 Apr 2017 08:28:40 +0000 (10:28 +0200)
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>
drivers/bluetooth/hci_ll.c

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