Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Sun, 1 Oct 2023 15:48:07 +0800
From:   "Lee, Chun-Yi" <jlee@suse.com>
To:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc:     linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org
Subject: [PATCH 1/2] Bluetooth: hci_event: Ignore NULL link key
Message-ID: <20231001074807.GA14403@linux-691t>
References: <20231001074524.GA14361@linux-691t>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231001074524.GA14361@linux-691t>
User-Agent: Mutt/1.11.4 (2019-03-13)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k9opQ7n7Save4OoAPzWQnyApFFhun3zNwl62b4Za1q2sctL866oGXnLrbErK?=
 =?us-ascii?Q?SbD6fm79VJI9CPlKHdiQQEQnORKbEVR6mpW96QX9PUEWyU53JRJdRR8mm90p?=
 =?us-ascii?Q?qRA/yAehoiKFyxIsJ3ExPH0bFHaYnzJM8pFAUTkV/6mo6pDE78jKxjfVWWrY?=
 =?us-ascii?Q?tgeycwNkOtZCbFmob1mB3MyiCVUpNsca3stSXOpMnX88SjTBC+RAtB3QH5qi?=
 =?us-ascii?Q?lafbKQS8f43FF3OMxxiu+J2sCqHDZGfLQUufiIwqSsDF9UOg8NjWV4WndNdQ?=
 =?us-ascii?Q?xlnOORj+aYzLdSiPraPlgxaZA82+m7JS98YKmOhrCVW9bVTpFHaSIVX9wEM5?=
 =?us-ascii?Q?sm0Z/kZ5aChccZlzJb57e8wt1UHPjbJ3U/aGQcbDF6fn7Ezy04NjPnZl9cli?=
 =?us-ascii?Q?5o+psBWrJJL2tWZSvz8WnFGZfWc+xFDQuK2F2N0ygU64OkK2ug1ZnsbmRdxs?=
 =?us-ascii?Q?Dw3xKUvpTBKxUZfxhgKK1NQ8R4pzsbpTeak/tYqJTVy8qLHNNLQRKdzCXB6C?=
 =?us-ascii?Q?4AMvndt7Z06e+DsGqrA3z69w82I16mMqwWks4EEjHIQVKoPZ3ZmdFXEumATf?=
 =?us-ascii?Q?fkhYd5ynwlTJgorT2SXaywZth89xSDCV2GBF2jZERytgpD1IjaqlOXWQBWvm?=
 =?us-ascii?Q?xZpTPdMZYdSsQjGcUjioMzsFLf0g53pAMov1ryb4gUMcd+qMwpz8ihkqaWq+?=
 =?us-ascii?Q?MkPWjtKG4yn18Yugju+fFWym3AoDeF+UiQiFHJpz96g/KlK8DByDhV7GA1wy?=
 =?us-ascii?Q?0sn8Ynb/Kvv2iuKZECiJaVPt0YS1DHCyCzvMHXCYA2iMFD0wD7Qar3PRArOw?=
 =?us-ascii?Q?+SGcC6YXU/SY2iPPd3C0H/aAZrGsA2YzviD9fYY8VBzfSzb3ZI5scwmpPOxu?=
 =?us-ascii?Q?VAWWqP1XrIwIvGx6K7N7c9Dl0jpAzBzDZG5sEE2xBCmuxmJersNI+ii5Nl4d?=
 =?us-ascii?Q?q0SOJlKDlV1Z62L6i2pkpaomF7nhdEVi9m4es4WUB5xzwUimzfNDiD4NYjOq?=
 =?us-ascii?Q?kUH6yDqQWX/pH/hL8k1gMDxLMay1fFFq5gHZ+3LSOr60S04SUNvIrQZDImvO?=
 =?us-ascii?Q?XXEA0XOvuSTsjfNKC+Inz/jMG6UyMtKzk072lIlBjVFfEfLLMvf8hPHy/FB9?=
 =?us-ascii?Q?JwsT3QrJF/kmGjyTDy+vZZtBGw986nW7n0DewkrJdfiw9xF43/IPUhxwwt97?=
 =?us-ascii?Q?QMg03ruV3npzbqk86nu6g0sRRkIUGTeoAL3Qj+adGBBhy+6t+NalaSuF2a4Q?=
 =?us-ascii?Q?en+u0vhGKRwNJinkDjEPpgsuOIUCaItOwCXraDR0cNDvN6HSvIeDXUJ80fEr?=
 =?us-ascii?Q?NZF/vquSt2bDkJsECM9funVJ5V54f7U5lZor0Syqc7Sv/eFFfL2U3k6A3bRi?=
 =?us-ascii?Q?AsQ3b4Ys0py19lL6w8eCF+0oBHr6DhmCm9XPc9fnlzl8/rm1gPHuk9gKZF4h?=
 =?us-ascii?Q?mCOmWlVV9ype4aahJElGwdlZGZb7S1YkfWXPhCntFBtCvz91LLoOByeVIQJ8?=
 =?us-ascii?Q?QjB/oIe6BFspsie7Mtn3V/FZvxeQRB/psOX6oYhRDbD/YeXTyVZt7vyFt1TP?=
 =?us-ascii?Q?dL6/kp2MlOpcUZ4IwBI=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b3fac63-3358-4cc8-fe11-08dbc252c715
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB7164.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 07:48:18.7234
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Syj0m95vYuCE59VtdhfIpFUGC2Fm4bdvRXYeY1T68DOQ2ArMjeMxc0p1zNeFuJq1
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7531
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 01 Oct 2023 00:48:40 -0700 (PDT)

This change is used to relieve CVE-2020-26555. The description of the
CVE:

Bluetooth legacy BR/EDR PIN code pairing in Bluetooth Core Specification
1.0B through 5.2 may permit an unauthenticated nearby device to spoof
the BD_ADDR of the peer device to complete pairing without knowledge
of the PIN. [1]

The detail of this attack is in IEEE paper:
BlueMirror: Reflections on Bluetooth Pairing and Provisioning Protocols
[2]

It's a reflection attack. The paper mentioned that attacker can induce
the attacked target to generate null link key (zero key) without PIN
code. In BR/EDR, the key generation is actually handled in the controller
which is below HCI.

Thus, we can ignore null link key in the handler of "Link Key Notification
event" to relieve the attack. A similar implementation also shows in
btstack project. [3]

v3: Drop the connection when null link key be detected.

v2:
- Used Link: tag instead of Closes:
- Used bt_dev_dbg instead of BT_DBG
- Added Fixes: tag

Fixes: 55ed8ca10f35 ("Bluetooth: Implement link key handling for the management interface")
Link: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-26555 [1]
Link: https://ieeexplore.ieee.org/abstract/document/9474325/authors#authors [2]
Link: https://github.com/bluekitchen/btstack/blob/master/src/hci.c#L3722 [3]
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
---
 net/bluetooth/hci_event.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 95816a938cea..a20a94e85b1a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4692,6 +4692,14 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, void *data,
 	if (!conn)
 		goto unlock;
 
+	/* Ignore NULL link key against CVE-2020-26555 */
+	if (!memcmp(ev->link_key, ZERO_KEY, HCI_LINK_KEY_SIZE)) {
+		bt_dev_dbg(hdev, "Ignore NULL link key (ZERO KEY) for %pMR", &ev->bdaddr);
+		hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
+		hci_conn_drop(conn);
+		goto unlock;
+	}
+
 	hci_conn_hold(conn);
 	conn->disc_timeout = HCI_DISCONN_TIMEOUT;
 	hci_conn_drop(conn);
-- 
2.35.3

From 5fed42878147cffa22e695732d87a85c218d217f Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <jlee@suse.com>
Date: Fri, 14 Jul 2023 21:14:01 +0800
Subject: [PATCH 1/2] Bluetooth: hci_event: Ignore NULL link key
In-Reply-To: <20231001074524.GA14361@linux-691t>
References: <20231001074524.GA14361@linux-691t>

This change is used to relieve CVE-2020-26555. The description of the
CVE:

Bluetooth legacy BR/EDR PIN code pairing in Bluetooth Core Specification
1.0B through 5.2 may permit an unauthenticated nearby device to spoof
the BD_ADDR of the peer device to complete pairing without knowledge
of the PIN. [1]

The detail of this attack is in IEEE paper:
BlueMirror: Reflections on Bluetooth Pairing and Provisioning Protocols
[2]

It's a reflection attack. The paper mentioned that attacker can induce
the attacked target to generate null link key (zero key) without PIN
code. In BR/EDR, the key generation is actually handled in the controller
which is below HCI.

Thus, we can ignore null link key in the handler of "Link Key Notification
event" to relieve the attack. A similar implementation also shows in
btstack project. [3]

v3: Drop the connection when null link key be detected.

v2:
- Used Link: tag instead of Closes:
- Used bt_dev_dbg instead of BT_DBG
- Added Fixes: tag

Fixes: 55ed8ca10f35 ("Bluetooth: Implement link key handling for the management interface")
Link: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-26555 [1]
Link: https://ieeexplore.ieee.org/abstract/document/9474325/authors#authors [2]
Link: https://github.com/bluekitchen/btstack/blob/master/src/hci.c#L3722 [3]
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
---
 net/bluetooth/hci_event.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 95816a938cea..a20a94e85b1a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4692,6 +4692,14 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, void *data,
 	if (!conn)
 		goto unlock;
 
+	/* Ignore NULL link key against CVE-2020-26555 */
+	if (!memcmp(ev->link_key, ZERO_KEY, HCI_LINK_KEY_SIZE)) {
+		bt_dev_dbg(hdev, "Ignore NULL link key (ZERO KEY) for %pMR", &ev->bdaddr);
+		hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
+		hci_conn_drop(conn);
+		goto unlock;
+	}
+
 	hci_conn_hold(conn);
 	conn->disc_timeout = HCI_DISCONN_TIMEOUT;
 	hci_conn_drop(conn);
-- 
2.35.3