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 16:11:06 +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 2/2] Bluetooth: Reject connection with the device which has
 same BD_ADDR
Message-ID: <20231001081106.GA14555@linux-691t>
References: <20231001080328.GA14494@linux-691t>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231001080328.GA14494@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?SwWkcz5GaWsy+vZNH2kW3iOStQoWSja4sjFeRUcUpPzmKvoTkoUYOdrNU5dV?=
 =?us-ascii?Q?dOLjzxcOKi7LfTBUpSX1ksheS/zuou5yRS+ZdnnZp+CGa3AxC6+BOTj/fI5G?=
 =?us-ascii?Q?NJs1t3r2BPLTp7I5l0PDd/9CA0C7bMDdbyZ2z0lnlJ5FHySrEkk9XduX0aA5?=
 =?us-ascii?Q?T9r4Kfd7HtVibSRzq11/9WYwPP3oLl26TkCDCljZH8Gi/K1MJDRB2f9WLBzv?=
 =?us-ascii?Q?V2zPISbDayWuQZyjH883h1D5QrFAsRaJEpD3mI2ytEZg7K2rDWpaV0mAclWB?=
 =?us-ascii?Q?oIGLXOMI1OjsoGNIek30SkTrlLUgR8nLiDG6DTFqDagK0+LxVr7h3w4WGJvW?=
 =?us-ascii?Q?LJct7uIcfOoGFmjgzzeAumxQ5vYiIEhqie3RzeB0hEfRaFhbPCurnugRL6he?=
 =?us-ascii?Q?hQIyZR/CKuV14GoqI6SZgY8y4m8YAwGY3Jf5HuRwClfvLi0J/wxZ4kM63Q5q?=
 =?us-ascii?Q?FfFkFCir2ka+gsB4f3LwQLrzs9IgoxWrLdc4jzPm5I2ToRBQBy21Z/9CcgWs?=
 =?us-ascii?Q?4DhiTec6Fa8uzS+yW3SN5YcfYP1KO3x4jOz/+lt+CXZ74tMSgv+gjut3VAMT?=
 =?us-ascii?Q?KeQOIaMAZ+HCZJozVao7tyZQtb6rP9+kxebVd8ZRnL+8qpDXLntRf6kC6JAG?=
 =?us-ascii?Q?vnXb7dlT4ipaIcomj+eBiuJ0Lcv3ulFsAwTYOVGDvT4gEuw0p6HoU8w6V19b?=
 =?us-ascii?Q?g2i+BHLDqB0dBSFx+i0Nl19BJtmkzHZqEzMLmilJT0lLIfxYD/cxtV8N4yvt?=
 =?us-ascii?Q?Y6kRIhKyU0oa1N0jADZru9Xf08Rji5EuD4lR/if4XrC51diAGaiIAJx11jiV?=
 =?us-ascii?Q?gNy86SrBCb5j0hx3itzsej4JIhIttjKP6CjsflZyUofaTV5+iDuSI7kOIOcb?=
 =?us-ascii?Q?YxJiqARU2xZSqhU6H3LDKja1s4VbAV/nGUdD5V9eXIaMnuR9fAbBfIiuQ46J?=
 =?us-ascii?Q?nUr7vgqRNlY1bOl/wIPOI6UG2x+quMDCAU4w9ofEYFLux/hy1uJs8YoHPPyz?=
 =?us-ascii?Q?Z8XVnYgOW58CzEtPggMEVIvNWKb7PRbOGlFtkSWbwQhCBnHtFI5m0twGpPye?=
 =?us-ascii?Q?poJ/iNrcFz/gsdEcPXqZugx/kPwX9cfI7mhdqlUjP6Pa7WH7bewXVD6aF75A?=
 =?us-ascii?Q?jMSGJJDY7L0qBBvuhmi0l0pkWV1xbDWKOac9ef72QzwwAz5WieUtrMA5Vagj?=
 =?us-ascii?Q?KKVph7CO5WTPU3A69D4G12m+tB8fwesNxCZIn6LYtYQSOGMuQRiKzhIA4+M5?=
 =?us-ascii?Q?bZf3XH4ACTLmKP+RxZNG62DK8SY1QeZUQnA6qgTvzZVptIxhUvIeGLPiCL3h?=
 =?us-ascii?Q?DB/UATeX64a81I7tLMgFBbtk18ccEXzysKc6AD6pwppbdi9xZWJN+ELisALG?=
 =?us-ascii?Q?U+ilTTkmQpKeTJmJg0L3FZxA1NGRx++au/UT7oazvuBmxpSZprjkmpgoGo3y?=
 =?us-ascii?Q?03NHqQocQG8lFDSJFtAm6sGosCzp3HLn34phIscLzkrAOivsPMfmU1Zh2b17?=
 =?us-ascii?Q?yvEUe/wgZm2psE1keYgnH08maAuCf1YI7yOdqyka2KS+BBcLFQA/XEsY22LT?=
 =?us-ascii?Q?l5Fa5Whyu31w1rrkw8zyqm07amEscG59JMJmFZl8?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecd61bae-4023-479a-977f-08dbc255fd17
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB7164.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 08:11:17.8275
 (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: 3HSgVtOENppa7Eieudycuov98sI4UEhauleDy2wypUWO7jcG6+G+ZSQu7bHDLste
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8572
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 01:11:36 -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.

A condition of this attack is that attacker should change the
BR_ADDR of his hacking device (Host B) to equal to the BR_ADDR with
the target device being attacked (Host A).

Thus, we reject the connection with device which has same BD_ADDR
both on HCI_Create_Connection and HCI_Connection_Request to prevent
the attack. A similar implementation also shows in btstack project.
[3][4]

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#L3523 [3]
Link: https://github.com/bluekitchen/btstack/blob/master/src/hci.c#L7297 [4]
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
---
 net/bluetooth/hci_conn.c  | 7 +++++++
 net/bluetooth/hci_event.c | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 056f9516e46d..583d2e18314e 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1611,6 +1611,13 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
 		return ERR_PTR(-EOPNOTSUPP);
 	}
 
+	/* Reject outgoing connection to device with same BD ADDR against CVE-2020-26555 */
+	if (!bacmp(&hdev->bdaddr, dst))
+	{
+		bt_dev_dbg(hdev, "Reject connection to the device with same BD_ADDR %pMR\n", dst);
+		return ERR_PTR(-ECONNREFUSED);
+	}
+
 	acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);
 	if (!acl) {
 		acl = hci_conn_add(hdev, ACL_LINK, dst, HCI_ROLE_MASTER);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a20a94e85b1a..d66718190dc5 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3268,6 +3268,14 @@ static void hci_conn_request_evt(struct hci_dev *hdev, void *data,
 
 	bt_dev_dbg(hdev, "bdaddr %pMR type 0x%x", &ev->bdaddr, ev->link_type);
 
+	/* Reject incoming connection from device with same BD ADDR against CVE-2020-26555 */
+	if (!bacmp(&hdev->bdaddr, &ev->bdaddr))
+	{
+		bt_dev_dbg(hdev, "Reject connection from the device with same BD_ADDR %pMR\n", &ev->bdaddr);
+		hci_reject_conn(hdev, &ev->bdaddr);
+		return;
+	}
+
 	mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type,
 				      &flags);
 
-- 
2.35.3