michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Fix failure handling with security level change

Browse source 
In case sufficient security level wasn't reached the error propagation
was missing, which could lead to incorrect state transitions when
update_sec_level_br() returns. Return true/false and make sure to
abort any further operations in case the update fails.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2019-08-27 10:09:53 +03:00 • committed by Johan Hedberg
commit 7d29296047
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/bluetooth/host/hci_core.c
View file

@ -1842,7 +1842,7 @@ static void update_sec_level_br(struct bt_conn *conn)
{ {
if (!conn->encrypt) { if (!conn->encrypt) {
conn->sec_level = BT_SECURITY_LOW; conn->sec_level = BT_SECURITY_LOW;
return; return true;
} }
if (conn->br.link_key) { if (conn->br.link_key) {
@ -1863,7 +1863,10 @@ static void update_sec_level_br(struct bt_conn *conn)
if (conn->required_sec_level > conn->sec_level) { if (conn->required_sec_level > conn->sec_level) {
BT_ERR("Failed to set required security level"); BT_ERR("Failed to set required security level");
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL); bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
return false;
} }
return true;
} }
static void synchronous_conn_complete(struct net_buf *buf) static void synchronous_conn_complete(struct net_buf *buf)
@ -1919,7 +1922,12 @@ static void conn_complete(struct net_buf *buf)
conn->handle = handle; conn->handle = handle;
conn->err = 0U; conn->err = 0U;
conn->encrypt = evt->encr_enabled; conn->encrypt = evt->encr_enabled;
update_sec_level_br(conn);
if (!update_sec_level_br(conn)) {
bt_conn_unref(conn);
return;
}
bt_conn_set_state(conn, BT_CONN_CONNECTED); bt_conn_set_state(conn, BT_CONN_CONNECTED);
bt_conn_unref(conn); bt_conn_unref(conn);
@ -3057,7 +3065,10 @@ static void hci_encrypt_change(struct net_buf *buf)
#endif /* CONFIG_BT_SMP */ #endif /* CONFIG_BT_SMP */
#if defined(CONFIG_BT_BREDR) #if defined(CONFIG_BT_BREDR)
if (conn->type == BT_CONN_TYPE_BR) { if (conn->type == BT_CONN_TYPE_BR) {
update_sec_level_br(conn); if (!update_sec_level_br(conn)) {
bt_conn_unref(conn);
return;
}
if (IS_ENABLED(CONFIG_BT_SMP)) { if (IS_ENABLED(CONFIG_BT_SMP)) {
/* /*
@ -3117,7 +3128,10 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf)
#endif /* CONFIG_BT_SMP */ #endif /* CONFIG_BT_SMP */
#if defined(CONFIG_BT_BREDR) #if defined(CONFIG_BT_BREDR)
if (conn->type == BT_CONN_TYPE_BR) { if (conn->type == BT_CONN_TYPE_BR) {
update_sec_level_br(conn); if (!update_sec_level_br(conn)) {
bt_conn_unref(conn);
return;
}
} }
#endif /* CONFIG_BT_BREDR */ #endif /* CONFIG_BT_BREDR */