From: Greg Kroah-Hartman Date: Thu, 1 Aug 2019 08:54:25 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.2.6~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce1585d75365f90a8244549fa5b0fecd44bac80a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: bluetooth-hci_uart-check-for-missing-tty-operations.patch --- diff --git a/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch b/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch new file mode 100644 index 00000000000..9c6e320ab9f --- /dev/null +++ b/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch @@ -0,0 +1,124 @@ +From b36a1552d7319bbfd5cf7f08726c23c5c66d4f73 Mon Sep 17 00:00:00 2001 +From: Vladis Dronov +Date: Tue, 30 Jul 2019 11:33:45 +0200 +Subject: Bluetooth: hci_uart: check for missing tty operations + +From: Vladis Dronov + +commit b36a1552d7319bbfd5cf7f08726c23c5c66d4f73 upstream. + +Certain ttys operations (pty_unix98_ops) lack tiocmget() and tiocmset() +functions which are called by the certain HCI UART protocols (hci_ath, +hci_bcm, hci_intel, hci_mrvl, hci_qca) via hci_uart_set_flow_control() +or directly. This leads to an execution at NULL and can be triggered by +an unprivileged user. Fix this by adding a helper function and a check +for the missing tty operations in the protocols code. + +This fixes CVE-2019-10207. The Fixes: lines list commits where calls to +tiocm[gs]et() or hci_uart_set_flow_control() were added to the HCI UART +protocols. + +Link: https://syzkaller.appspot.com/bug?id=1b42faa2848963564a5b1b7f8c837ea7b55ffa50 +Reported-by: syzbot+79337b501d6aa974d0f6@syzkaller.appspotmail.com +Cc: stable@vger.kernel.org # v2.6.36+ +Fixes: b3190df62861 ("Bluetooth: Support for Atheros AR300x serial chip") +Fixes: 118612fb9165 ("Bluetooth: hci_bcm: Add suspend/resume PM functions") +Fixes: ff2895592f0f ("Bluetooth: hci_intel: Add Intel baudrate configuration support") +Fixes: 162f812f23ba ("Bluetooth: hci_uart: Add Marvell support") +Fixes: fa9ad876b8e0 ("Bluetooth: hci_qca: Add support for Qualcomm Bluetooth chip wcn3990") +Signed-off-by: Vladis Dronov +Signed-off-by: Marcel Holtmann +Reviewed-by: Yu-Chen, Cho +Tested-by: Yu-Chen, Cho +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/hci_ath.c | 3 +++ + drivers/bluetooth/hci_bcm.c | 3 +++ + drivers/bluetooth/hci_intel.c | 3 +++ + drivers/bluetooth/hci_ldisc.c | 13 +++++++++++++ + drivers/bluetooth/hci_mrvl.c | 3 +++ + drivers/bluetooth/hci_uart.h | 1 + + 6 files changed, 26 insertions(+) + +--- a/drivers/bluetooth/hci_ath.c ++++ b/drivers/bluetooth/hci_ath.c +@@ -101,6 +101,9 @@ static int ath_open(struct hci_uart *hu) + + BT_DBG("hu %p", hu); + ++ if (!hci_uart_has_flow_control(hu)) ++ return -EOPNOTSUPP; ++ + ath = kzalloc(sizeof(*ath), GFP_KERNEL); + if (!ath) + return -ENOMEM; +--- a/drivers/bluetooth/hci_bcm.c ++++ b/drivers/bluetooth/hci_bcm.c +@@ -279,6 +279,9 @@ static int bcm_open(struct hci_uart *hu) + + bt_dev_dbg(hu->hdev, "hu %p", hu); + ++ if (!hci_uart_has_flow_control(hu)) ++ return -EOPNOTSUPP; ++ + bcm = kzalloc(sizeof(*bcm), GFP_KERNEL); + if (!bcm) + return -ENOMEM; +--- a/drivers/bluetooth/hci_intel.c ++++ b/drivers/bluetooth/hci_intel.c +@@ -407,6 +407,9 @@ static int intel_open(struct hci_uart *h + + BT_DBG("hu %p", hu); + ++ if (!hci_uart_has_flow_control(hu)) ++ return -EOPNOTSUPP; ++ + intel = kzalloc(sizeof(*intel), GFP_KERNEL); + if (!intel) + return -ENOMEM; +--- a/drivers/bluetooth/hci_ldisc.c ++++ b/drivers/bluetooth/hci_ldisc.c +@@ -263,6 +263,19 @@ static int hci_uart_send_frame(struct hc + return 0; + } + ++/* Check the underlying device or tty has flow control support */ ++bool hci_uart_has_flow_control(struct hci_uart *hu) ++{ ++ /* serdev nodes check if the needed operations are present */ ++ if (hu->serdev) ++ return true; ++ ++ if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset) ++ return true; ++ ++ return false; ++} ++ + /* Flow control or un-flow control the device */ + void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) + { +--- a/drivers/bluetooth/hci_mrvl.c ++++ b/drivers/bluetooth/hci_mrvl.c +@@ -66,6 +66,9 @@ static int mrvl_open(struct hci_uart *hu + + BT_DBG("hu %p", hu); + ++ if (!hci_uart_has_flow_control(hu)) ++ return -EOPNOTSUPP; ++ + mrvl = kzalloc(sizeof(*mrvl), GFP_KERNEL); + if (!mrvl) + return -ENOMEM; +--- a/drivers/bluetooth/hci_uart.h ++++ b/drivers/bluetooth/hci_uart.h +@@ -109,6 +109,7 @@ int hci_uart_tx_wakeup(struct hci_uart * + int hci_uart_init_ready(struct hci_uart *hu); + void hci_uart_init_tty(struct hci_uart *hu); + void hci_uart_set_baudrate(struct hci_uart *hu, unsigned int speed); ++bool hci_uart_has_flow_control(struct hci_uart *hu); + void hci_uart_set_flow_control(struct hci_uart *hu, bool enable); + void hci_uart_set_speeds(struct hci_uart *hu, unsigned int init_speed, + unsigned int oper_speed); diff --git a/queue-4.9/series b/queue-4.9/series index 38d73384d5c..e43ff8a9ed8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -217,3 +217,4 @@ isdn-hfcsusb-checking-idx-of-ep-configuration.patch media-au0828-fix-null-dereference-in-error-path.patch media-cpia2_usb-first-wake-up-then-free-in-disconnect.patch media-radio-raremono-change-devm_k-alloc-to-k-alloc.patch +bluetooth-hci_uart-check-for-missing-tty-operations.patch