michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ATT: Handle encrypt change event unrelated to current req

Browse source 
Fix issue where the encrypt change has an error code, but the
encrypt change request was unrelated to the current ATT request.

This lead to the current ATT transaction being interpreted as finished
an the ATT client would proceed with the next ATT request, which would
fail since the ATT client is now violating the ATT single transaction
rule.

Updated similar if statement checking for the opposite to improve
readability.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-10-28 13:12:15 +01:00 • committed by Johan Hedberg
commit 5e999a3081
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/host/att.c
View file

@ -2694,7 +2694,7 @@ static void bt_att_encrypt_change(struct bt_l2cap_chan *chan,
* outstanding request about security failure. * outstanding request about security failure.
*/ */
if (hci_status) { if (hci_status) {
if (att_chan->req) { if (att_chan->req && att_chan->req->retrying) {
att_handle_rsp(att_chan, NULL, 0, att_handle_rsp(att_chan, NULL, 0,
BT_ATT_ERR_AUTHENTICATION); BT_ATT_ERR_AUTHENTICATION);
} }
@ -2708,7 +2708,7 @@ static void bt_att_encrypt_change(struct bt_l2cap_chan *chan,
return; return;
} }
if (!att_chan->req || !att_chan->req->retrying) { if (!(att_chan->req && att_chan->req->retrying)) {
return; return;
} }