Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION

Vudentz · Vudentz · commit 03dba9cea72f · 2025-05-30T13:29:42.000-04:00
Depending on the security set the response to L2CAP_LE_CONN_REQ shall be just L2CAP_CR_LE_ENCRYPTION if only encryption when BT_SECURITY_MEDIUM is selected since that means security mode 2 which doesn't require authentication which is something that is covered in the qualification test L2CAP/LE/CFC/BV-25-C. Link: bluez/bluez#1270 Fixes: 27e2d4c ("Bluetooth: Add basic LE L2CAP connect request receiving support") Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
@@ -4870,7 +4870,8 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
 
 	if (!smp_sufficient_security(conn->hcon, pchan->sec_level,
 				     SMP_ALLOW_STK)) {
-		result = L2CAP_CR_LE_AUTHENTICATION;
+		result = pchan->sec_level == BT_SECURITY_MEDIUM ?
+			L2CAP_CR_LE_ENCRYPTION : L2CAP_CR_LE_AUTHENTICATION;
 		chan = NULL;
 		goto response_unlock;
 	}

Original file line number	Diff line number	Diff line change
`@@ -4870,7 +4870,8 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,`
`4870`	`4870`
`4871`	`4871`	`if (!smp_sufficient_security(conn->hcon, pchan->sec_level,`
`4872`	`4872`	`SMP_ALLOW_STK)) {`
`4873`		`- result = L2CAP_CR_LE_AUTHENTICATION;`
	`4873`	`+ result = pchan->sec_level == BT_SECURITY_MEDIUM ?`
	`4874`	`+ L2CAP_CR_LE_ENCRYPTION : L2CAP_CR_LE_AUTHENTICATION;`
`4874`	`4875`	`chan = NULL;`
`4875`	`4876`	`goto response_unlock;`
`4876`	`4877`	`}`