jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Address race condition with GO Negotiation Request TX status

Browse source 
If both peers initiate GO Negotiation at about the same time, it is
possible for the GO Negotiation Request frame from the peer to be
received between the local attempt to send the GO Negotiation Request
and TX status event for that. This could result in both devices sending
GO Negotiation Response frames even though one of them should have
skipped this based which device uses a higher MAC address.

Resolve this race by incrementing go_neg_req_sent when p2p_send_action()
returns success instead of doing this from the TX status callback. If
the frame is not acknowledged, go_neg_req_sent is cleared in TX status
handler.

Signed-off-by: Neeraj Garg <neerajkg@broadcom.com>
This commit is contained in:
Neeraj Kumar Garg 2012-06-09 18:03:47 +03:00 committed by Jouni Malinen
parent dada954ad7
commit a1d2ab329e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p2p/p2p.c
View file

@ -2704,11 +2704,13 @@ static void p2p_go_neg_req_cb(struct p2p_data *p2p, int success)
} }
if (success) { if (success) {
dev->go_neg_req_sent++;
if (dev->flags & P2P_DEV_USER_REJECTED) { if (dev->flags & P2P_DEV_USER_REJECTED) {
p2p_set_state(p2p, P2P_IDLE); p2p_set_state(p2p, P2P_IDLE);
return; return;
} }
} else if (dev->go_neg_req_sent) {
/* Cancel the increment from p2p_connect_send() on failure */
dev->go_neg_req_sent--;
} }
if (!success && if (!success &&

3
src/p2p/p2p_go_neg.c
View file

@ -227,7 +227,8 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev)
"P2P: Failed to send Action frame"); "P2P: Failed to send Action frame");
/* Use P2P find to recover and retry */ /* Use P2P find to recover and retry */
p2p_set_timeout(p2p, 0, 0); p2p_set_timeout(p2p, 0, 0);
} } else
dev->go_neg_req_sent++;
wpabuf_free(req); wpabuf_free(req);