78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
|
From b19a194712d8f25e80d53803ccd0176f619b3fbc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||
|
|
Date: Tue, 8 Aug 2023 10:38:26 +0000
|
||
|
|
Subject: [PATCH 1/7] Bluetooth: L2CAP: Fix accepting connection request for
|
||
|
|
invalid SPSM
|
||
|
|
|
||
|
|
commit 711f8c3fb3db61897080468586b970c87c61d9e4 upstream
|
||
|
|
Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||
|
|
Date: Mon Oct 31 16:10:32 2022 -0700
|
||
|
|
|
||
|
|
Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM
|
||
|
|
|
||
|
|
The Bluetooth spec states that the valid range for SPSM is from
|
||
|
|
0x0001-0x00ff so it is invalid to accept values outside of this range:
|
||
|
|
|
||
|
|
BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A
|
||
|
|
page 1059:
|
||
|
|
Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges
|
||
|
|
|
||
|
|
CVE: CVE-2022-42896
|
||
|
|
CC: stable@vger.kernel.org
|
||
|
|
Reported-by: Tamás Koczka <poprdi@google.com>
|
||
|
|
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||
|
|
Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com>
|
||
|
|
|
||
|
|
Signed-off-by: Nagappan Ramasamy Palaniappan <nagappan.ramasamy.palaniappan@oracle.com>
|
||
|
|
Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
|
||
|
|
---
|
||
|
|
net/bluetooth/l2cap_core.c | 25 +++++++++++++++++++++++++
|
||
|
|
1 file changed, 25 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
|
||
|
|
index 86ecd4ad4..4fed6d24a 100644
|
||
|
|
--- a/net/bluetooth/l2cap_core.c
|
||
|
|
+++ b/net/bluetooth/l2cap_core.c
|
||
|
|
@@ -5771,6 +5771,19 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
|
||
|
|
BT_DBG("psm 0x%2.2x scid 0x%4.4x mtu %u mps %u", __le16_to_cpu(psm),
|
||
|
|
scid, mtu, mps);
|
||
|
|
|
||
|
|
+ /* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A
|
||
|
|
+ * page 1059:
|
||
|
|
+ *
|
||
|
|
+ * Valid range: 0x0001-0x00ff
|
||
|
|
+ *
|
||
|
|
+ * Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges
|
||
|
|
+ */
|
||
|
|
+ if (!psm || __le16_to_cpu(psm) > L2CAP_PSM_LE_DYN_END) {
|
||
|
|
+ result = L2CAP_CR_LE_BAD_PSM;
|
||
|
|
+ chan = NULL;
|
||
|
|
+ goto response;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Check if we have socket listening on psm */
|
||
|
|
pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, &conn->hcon->src,
|
||
|
|
&conn->hcon->dst, LE_LINK);
|
||
|
|
@@ -5958,6 +5971,18 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,
|
||
|
|
|
||
|
|
psm = req->psm;
|
||
|
|
|
||
|
|
+ /* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A
|
||
|
|
+ * page 1059:
|
||
|
|
+ *
|
||
|
|
+ * Valid range: 0x0001-0x00ff
|
||
|
|
+ *
|
||
|
|
+ * Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges
|
||
|
|
+ */
|
||
|
|
+ if (!psm || __le16_to_cpu(psm) > L2CAP_PSM_LE_DYN_END) {
|
||
|
|
+ result = L2CAP_CR_LE_BAD_PSM;
|
||
|
|
+ goto response;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
BT_DBG("psm 0x%2.2x mtu %u mps %u", __le16_to_cpu(psm), mtu, mps);
|
||
|
|
|
||
|
|
memset(&pdu, 0, sizeof(pdu));
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|