Bluetooth: hci_uart_set_flow_control: Fix NULL deref when using serdev
authorHans de Goede <hdegoede@redhat.com>
Wed, 4 Oct 2017 18:43:35 +0000 (20:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Dec 2017 13:26:27 +0000 (14:26 +0100)
[ Upstream commit 7841d554809b518a22349e7e39b6b63f8a48d0fb ]

Fix a NULL pointer deref (hu->tty) when calling hci_uart_set_flow_control
on hci_uart-s using serdev.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/bluetooth/hci_ldisc.c

index 6e24038..6aef3bd 100644 (file)
@@ -41,6 +41,7 @@
 #include <linux/ioctl.h>
 #include <linux/skbuff.h>
 #include <linux/firmware.h>
+#include <linux/serdev.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -298,6 +299,12 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable)
        unsigned int set = 0;
        unsigned int clear = 0;
 
+       if (hu->serdev) {
+               serdev_device_set_flow_control(hu->serdev, !enable);
+               serdev_device_set_rts(hu->serdev, !enable);
+               return;
+       }
+
        if (enable) {
                /* Disable hardware flow control */
                ktermios = tty->termios;