Commit 64e759f5 authored Feb 26, 2018 by Szymon Janc Committed by Marcel Holtmann Mar 01, 2018

Bluetooth: Fix missing encryption refresh on Security Request



If Security Request is received on connection that is already encrypted
with sufficient security master should perform encryption key refresh
procedure instead of just ignoring Slave Security Request
(Core Spec 5.0 Vol 3 Part H 2.4.6).

> ACL Data RX: Handle 3585 flags 0x02 dlen 6
      SMP: Security Request (0x0b) len 1
        Authentication requirement: Bonding, No MITM, SC, No Keypresses (0x09)
< HCI Command: LE Start Encryption (0x08|0x0019) plen 28
        Handle: 3585
        Random number: 0x0000000000000000
        Encrypted diversifier: 0x0000
        Long term key: 44264272a5c426a9e868f034cf0e69f3
> HCI Event: Command Status (0x0f) plen 4
      LE Start Encryption (0x08|0x0019) ncmd 1
        Status: Success (0x00)
> HCI Event: Encryption Key Refresh Complete (0x30) plen 3
        Status: Success (0x00)
        Handle: 3585

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 0c6e5266

net/bluetooth/smp.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -2296,8 +2296,14 @@ static u8 smp_cmd_security_req(struct l2cap_conn conn, struct sk_buff skb)
		else
		sec_level = authreq_to_seclevel(auth);

		if (smp_sufficient_security(hcon, sec_level, SMP_USE_LTK))
		if (smp_sufficient_security(hcon, sec_level, SMP_USE_LTK)) {
		/* If link is already encrypted with sufficient security we
		* still need refresh encryption as per Core Spec 5.0 Vol 3,
		* Part H 2.4.6
		*/
		smp_ltk_encrypt(conn, hcon->sec_level);
		return 0;
		}

		if (sec_level > hcon->pending_sec_level)
		hcon->pending_sec_level = sec_level;

Admin message