Bluetooth: add NULL pointer check in HCI
authorJun Nie <njun@marvell.com>
Tue, 7 Dec 2010 06:03:38 +0000 (14:03 +0800)
committerWilly Tarreau <w@1wt.eu>
Sun, 7 Oct 2012 21:37:38 +0000 (23:37 +0200)
commit d9319560b86839506c2011346b1f2e61438a3c73 upstream.

If we fail to find a hci device pointer in hci_uart, don't try
to deref the NULL one we do have.

Signed-off-by: Jun Nie <njun@marvell.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/bluetooth/hci_ldisc.c

index e3d4eda93ed95f915e186a2caaa7e48bf1524e6f..e6f67b62876bd2043b13ec196525ea296ab32240 100644 (file)
@@ -313,8 +313,10 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 
                if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
                        hu->proto->close(hu);
-                       hci_unregister_dev(hdev);
-                       hci_free_dev(hdev);
+                       if (hdev) {
+                               hci_unregister_dev(hdev);
+                               hci_free_dev(hdev);
+                       }
                }
        }
 }