bluetooth: Fix missing NULL check
authorAlan Cox <alan@linux.intel.com>
Fri, 22 Oct 2010 13:11:26 +0000 (14:11 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Oct 2010 15:33:18 +0000 (08:33 -0700)
Fortunately this is only exploitable on very unusual hardware.

[Reported a while ago but nothing happened so just fixing it]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/bluetooth/hci_ldisc.c

index 998833d93c13c724ffbc828ab0f62ad07e1c438c..17361bad46dd9e367a027c4506ceea7504d76af5 100644 (file)
@@ -256,9 +256,16 @@ static int hci_uart_tty_open(struct tty_struct *tty)
 
        BT_DBG("tty %p", tty);
 
+       /* FIXME: This btw is bogus, nothing requires the old ldisc to clear
+          the pointer */
        if (hu)
                return -EEXIST;
 
+       /* Error if the tty has no write op instead of leaving an exploitable
+          hole */
+       if (tty->ops->write == NULL)
+               return -EOPNOTSUPP;
+
        if (!(hu = kzalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
                BT_ERR("Can't allocate control structure");
                return -ENFILE;