Bluetooth: hci_uart: check for missing tty operations (CVE-2019-10207)
This commit is contained in:
Romain Perier
parent
ec64cb4c87
commit
3b76691d24
|
|
@ -11,6 +11,7 @@ linux (4.19.37-5+deb10u2) UNRELEASED; urgency=medium
|
|||
* floppy: fix out-of-bounds read in copy_buffer (CVE-2019-14283)
|
||||
* inet: switch IP ID generator to siphash (CVE-2019-10638)
|
||||
* floppy: fix div-by-zero in setup_format_params (CVE-2019-14284)
|
||||
* Bluetooth: hci_uart: check for missing tty operations (CVE-2019-10207)
|
||||
|
||||
-- Romain Perier <romain.perier@gmail.com> Mon, 22 Jul 2019 14:00:00 +0200
|
||||
|
||||
|
|
|
|||
152
debian/patches/bugfix/all/Bluetooth-hci_uart-check-for-missing-tty-operations.patch
vendored
Normal file
152
debian/patches/bugfix/all/Bluetooth-hci_uart-check-for-missing-tty-operations.patch
vendored
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
From: Vladis Dronov <vdronov@redhat.com>
|
||||
Date: Tue, 30 Jul 2019 11:33:45 +0200
|
||||
Subject: Bluetooth: hci_uart: check for missing tty operations
|
||||
Origin: https://git.kernel.org/linus/b36a1552d7319bbfd5cf7f08726c23c5c66d4f73
|
||||
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-10207
|
||||
|
||||
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 <vdronov@redhat.com>
|
||||
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
Reviewed-by: Yu-Chen, Cho <acho@suse.com>
|
||||
Tested-by: Yu-Chen, Cho <acho@suse.com>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
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_qca.c | 3 +++
|
||||
drivers/bluetooth/hci_uart.h | 1 +
|
||||
7 files changed, 29 insertions(+)
|
||||
|
||||
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
|
||||
index d568fbd94d6c..20235925344d 100644
|
||||
--- a/drivers/bluetooth/hci_ath.c
|
||||
+++ b/drivers/bluetooth/hci_ath.c
|
||||
@@ -112,6 +112,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;
|
||||
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
|
||||
index 800132369134..aa6b7ed9fdf1 100644
|
||||
--- a/drivers/bluetooth/hci_bcm.c
|
||||
+++ b/drivers/bluetooth/hci_bcm.c
|
||||
@@ -369,6 +369,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;
|
||||
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
|
||||
index 46ace321bf60..e9228520e4c7 100644
|
||||
--- a/drivers/bluetooth/hci_intel.c
|
||||
+++ b/drivers/bluetooth/hci_intel.c
|
||||
@@ -406,6 +406,9 @@ static int intel_open(struct hci_uart *hu)
|
||||
|
||||
BT_DBG("hu %p", hu);
|
||||
|
||||
+ if (!hci_uart_has_flow_control(hu))
|
||||
+ return -EOPNOTSUPP;
|
||||
+
|
||||
intel = kzalloc(sizeof(*intel), GFP_KERNEL);
|
||||
if (!intel)
|
||||
return -ENOMEM;
|
||||
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
|
||||
index c915daf01a89..efeb8137ec67 100644
|
||||
--- a/drivers/bluetooth/hci_ldisc.c
|
||||
+++ b/drivers/bluetooth/hci_ldisc.c
|
||||
@@ -299,6 +299,19 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
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)
|
||||
{
|
||||
diff --git a/drivers/bluetooth/hci_mrvl.c b/drivers/bluetooth/hci_mrvl.c
|
||||
index ffb00669346f..23791df081ba 100644
|
||||
--- 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;
|
||||
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
|
||||
index 77004c29da08..f96e58de049b 100644
|
||||
--- a/drivers/bluetooth/hci_qca.c
|
||||
+++ b/drivers/bluetooth/hci_qca.c
|
||||
@@ -450,6 +450,9 @@ static int qca_open(struct hci_uart *hu)
|
||||
|
||||
BT_DBG("hu %p qca_open", hu);
|
||||
|
||||
+ if (!hci_uart_has_flow_control(hu))
|
||||
+ return -EOPNOTSUPP;
|
||||
+
|
||||
qca = kzalloc(sizeof(struct qca_data), GFP_KERNEL);
|
||||
if (!qca)
|
||||
return -ENOMEM;
|
||||
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
|
||||
index 00cab2fd7a1b..067a610f1372 100644
|
||||
--- a/drivers/bluetooth/hci_uart.h
|
||||
+++ b/drivers/bluetooth/hci_uart.h
|
||||
@@ -118,6 +118,7 @@ int hci_uart_tx_wakeup(struct hci_uart *hu);
|
||||
int hci_uart_init_ready(struct hci_uart *hu);
|
||||
void hci_uart_init_work(struct work_struct *work);
|
||||
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);
|
||||
--
|
||||
cgit 1.2-0.3.lf.el7
|
||||
|
||||
|
|
@ -238,6 +238,7 @@ bugfix/all/input-gtco-bounds-check-collection-indent-level.patch
|
|||
bugfix/all/net-switch-IP-ID-generator-to-siphash.patch
|
||||
bugfix/all/floppy-fix-div-by-zero-in-setup_format_params.patch
|
||||
bugfix/all/floppy-fix-out-of-bounds-read-in-copy_buffer.patch
|
||||
bugfix/all/Bluetooth-hci_uart-check-for-missing-tty-operations.patch
|
||||
|
||||
# Fix exported symbol versions
|
||||
bugfix/all/module-disable-matching-missing-version-crc.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue