Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 19 Jul 2023 23:49:18 +0800
From:   joeyli <jlee@suse.com>
To:     Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc:     "Lee, Chun-Yi" <joeyli.kernel@gmail.com>,
        Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        "David S . Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org,
        Markus Elfring <Markus.Elfring@web.de>,
        Dan Carpenter <dan.carpenter@linaro.org>,
        linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH v2] Bluetooth: hci_event: Ignore NULL link key
Message-ID: <20230719154918.GJ14791@linux-l9pv.suse>
References: <20230718034337.23502-1-jlee@suse.com>
 <CABBYNZJ97UMyZ7yX1YAGbuU4XwNDdoFewKNwbd=51_L9aNrrCQ@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CABBYNZJ97UMyZ7yX1YAGbuU4XwNDdoFewKNwbd=51_L9aNrrCQ@mail.gmail.com>
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: =?utf-8?B?QkdQTTUyREJqQnhkNjIyYVg3QUNsb1grOUgxMjF3ZG42SUtzTFhiMmpEMWV6?=
 =?utf-8?B?SjNZenNocDE1YXRLa1J5Sk1VaTRXdUE5ak03QkNkODk4cjI5b05CL09HVzQ2?=
 =?utf-8?B?V0hOWlZ1cnUyMlBFTUVmSFQ0NVgya2dGdGZTZHhsaGNXa3FVc1M3dlczd3Q0?=
 =?utf-8?B?NHBaUFRpTE41bW0wTHE1SWV3dTdRMndlemEyeGJwMFpqYm5SYkpUY0VIVWdD?=
 =?utf-8?B?bmNHUUxUSjlaS1E3WlJZNWVrY1luclVOOGMrTTlNV3B1ZUFDZ0VnWkNGR0h1?=
 =?utf-8?B?WDJPOUdvdUgzSjRYMXV5WEtjMDV2QjNlMnJYN1dXbytZUG11b3NFVHczTjcr?=
 =?utf-8?B?bXVLNW0vejV6NDVtY21XSHlHQlowWk14Sjg2RFRrY2VxRW9pSjkvSnpxWWRT?=
 =?utf-8?B?R2o4a01iMHl0RDBqRnFaWitPNXJpY1Z5cGhNNXE5Um9ZaWlLUExaVmdzMFdn?=
 =?utf-8?B?TjNORGpZSGFQWXVJbXlHWXpoU3NLcmVBS2RveEtEWlY2RWNxc0JCdW4xU0dv?=
 =?utf-8?B?eUhpVENjdjVMNHdURkYwUEhLb1h6T3ZmWmM1OURyeFUzSGNWczNZZ1pLNEoy?=
 =?utf-8?B?MHJ0V3hkY2FVZ1BrWS8wTTdVU1JkK3NnQ3pqZWlEaDRtamYzMTBueWZqV3Er?=
 =?utf-8?B?T3Q2Q0ZqTm5sL3d5c09sOGoxWGlDdGErKzhQL0Z0OTlZcENpOFdTcWhNREg1?=
 =?utf-8?B?ajRVL3hObzBpRUhiMVk2QU9kdFozdXNQemhpckk2cWRBcDV6MDdwemIzYlpa?=
 =?utf-8?B?eEVKaVhwNmtvUWY2TzFER1ZUbE5tY1JKU1ZKTDJBeEJnRlEyenRicDhvT2FJ?=
 =?utf-8?B?cmpGaTJva1BGU1R0aWF5TU1yTGgvT2dnRzFKYTBEY2dWSllTRk9tNmJuVVJm?=
 =?utf-8?B?VURGVTdSZENEaFNnRkRHVHNaTjNhRG1idGxVREluUGJ1ZXVVbTJ4WlV3cGNl?=
 =?utf-8?B?V3V4SU1RQkJZaEM2TEpMQWZNQ3pzVUVHV0tGZFFxZjNaYXZIc3ZLOGIxQ0Y0?=
 =?utf-8?B?Vm9VMTZ4ZWZvcHhGUHZ4MlF5SU5oV04xNlE4VmdES1QzbmNvcW5lblNsdE5M?=
 =?utf-8?B?ZlJUUXRQcVZ2TVFwb1VDUW0zTGRVZEhyVUg1NW9ZUTNLUzAvT2xocnV6NDdG?=
 =?utf-8?B?amVBL2hSVmx5V0gyZk1QR3JzcFgwbEVINWJ5M0NHc0xWN0ZXNllHZ2hOUkF4?=
 =?utf-8?B?bXljdkRtMjJDN1JmTSs2U2xkRU1pakc1dEdjcHYxZmFHc2pCZU0rUThhZ0hK?=
 =?utf-8?B?dFkzZThiYkZKLzR0eW1LZFNCTGFIZEN5QnYwT2J5V29Zd21wTnd4V3ZDZmJ6?=
 =?utf-8?B?RDdERHBmd01ndG11ekFrU2RHK1BHNDF4NGZjMXJoVlNVd2k5aW55Q2k1aDZ1?=
 =?utf-8?B?OHVCUUJzSzdVMkM0cnRIQTVXVFphU1ZDa2ZwQmIvWVpEWmNTOThKU3Z2UkVZ?=
 =?utf-8?B?aW1WS1VhMUNJQWVnd0NpbzQvTVRaaWVBYjhYNXRpRFV2a0NBZ1JGZ2RGYWVX?=
 =?utf-8?B?dmdUZFdCYnBTRitTdkJjSUd1NUlvWHlkSm9IUWxsUVdWTjVrK1g1RXhYcUtK?=
 =?utf-8?B?RjlhZk55U3dDMS9HcVZUam9uVGphRjl3czc4L0pzUVFDaWxLYzdOV1QzelJ6?=
 =?utf-8?B?Q2I5c0RaMjVXRjhmc3Q1d0hhbUVkNHJhTGUwcCt3dVNvWVJJM2VHdG1KbVNC?=
 =?utf-8?B?SUxSemdVWkh5SnJOdzVobVBTYzE4OEFDZjc5UW43UkVnL1BYVnlYZ2l5eGZs?=
 =?utf-8?B?N0pwMlp0cDkwYkdlOXAxdzhYbDY3b1d5VzNpL2FMOHB2alJaSWF6bmJiMkVt?=
 =?utf-8?B?NUhFdm1aaFZ3bXVhalNLSk1RTWV0YS9RbFlDM2cyL2NoTjZpQzc3clhBbEJZ?=
 =?utf-8?B?SGtOcUVwSmZQWHh3eDg5dlhWV1ExVzhJSCt0YkdMU214T1dESm92bXNXVGll?=
 =?utf-8?B?aDRKU21iUllaYWdlWms4Y1pXV3ZnMEhHYllHUzlMTVFOQkx0Z1F2T1BKVUZl?=
 =?utf-8?B?NjQ0aXh1MmdEK01pY0tEOVpYRXo0S3o3eFk5c1RQZkowbE4wNHB1ckxhZ1Vh?=
 =?utf-8?B?NlNkemFGd21KaXpQdGxLY0lKUlpSYlV3eEZ6UlBycjBZOFVxZURnNjBtb1Uw?=
 =?utf-8?Q?zUnI=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: adbd0a4d-5ff1-4ee9-c2a0-08db886fc3f8
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB7164.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 15:49:41.4807
 (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: 2VwfyF76PD7IkocfldSoT3MUIR3R7Y/8WG0uLj4wfrdP8gpCoQ0V2QuupQX6IqCE
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7760
X-Spam-Status: No, score=-2.1 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,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Hi Luiz Augusto von Dentz, 

On Tue, Jul 18, 2023 at 10:22:26AM -0700, Luiz Augusto von Dentz wrote:
> Hi Chun-Yi,
> 
> On Mon, Jul 17, 2023 at 8:43 PM Lee, Chun-Yi <joeyli.kernel@gmail.com> wrote:
> >
> > 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]
> 
> Btw, it is probably worth mentioning that in BR/EDR the key generation
> is actually handled in the controller, below HCI.
>

Yes, the key generation be handled by link manager. I will mention it
in patch description. 
 
> > The detail of this attack is in IEEE paper:
> > BlueMirror: Reflections on Bluetooth Pairing and Provisioning Protocols
> > [2]
> >
> > It's a reflection attack. Base on the paper, attacker can induce the
> > attacked target to generate null link key (zero key) without PIN code.
> >
> > 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]
> 
> Perhaps we could clarify this statement by stating that if we ignore
> the link key it means the stack will not consider the device is bonded
> and will not persist the link key, that said the controller will still
> consider it as paired, so I perhaps we should go one step forward and
> disconnect if we detect such a key is being used.
>

I am new on bluetooth field. Did you mean like this patch? Sending
HCI_Disconnect when we found zero link key?

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ff0c331f53d6..3482031cbbb8 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4698,6 +4700,15 @@ 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);


Is there anything I'm missing? Thanks a lot!

> > 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 | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> > index 95816a938cea..ff0c331f53d6 100644
> > --- a/net/bluetooth/hci_event.c
> > +++ b/net/bluetooth/hci_event.c
> > @@ -4684,6 +4684,12 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, void *data,
> >         bool persistent;
> >         u8 pin_len = 0;
> >
> > +       /* 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);
> > +               return;
> > +       }
> > +
> >         bt_dev_dbg(hdev, "");
> >
> >         hci_dev_lock(hdev);
> > --
> > 2.35.3
> >

Thanks a lot!
Joey Lee