brcmfmac: Fix race condition in msgbuf ioctl processing.
authorHante Meuleman <meuleman@broadcom.com>
Fri, 6 Mar 2015 17:40:41 +0000 (18:40 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 13 Mar 2015 13:16:36 +0000 (15:16 +0200)
Msgbuf is using a wait_event_timeout to wait for the response on
an ioctl. The wakeup routine uses waitqueue_active to see if
wait_event_timeout has been called. There is a chance that the
response arrives before wait_event_timeout is called, this
will result in situation that wait_event_timeout never gets
woken again and assumed result will be a timeout. This patch
removes that errornous situation by always setting the
ctl_completed var before checking for queue active.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c

index 6262612dec450b649c3ccc1eb1b3e12205335fd3..4ec9811f49c87744458ed16cdcec32422432dc3f 100644 (file)
@@ -481,10 +481,9 @@ static int brcmf_msgbuf_ioctl_resp_wait(struct brcmf_msgbuf *msgbuf)
 
 static void brcmf_msgbuf_ioctl_resp_wake(struct brcmf_msgbuf *msgbuf)
 {
-       if (waitqueue_active(&msgbuf->ioctl_resp_wait)) {
-               msgbuf->ctl_completed = true;
+       msgbuf->ctl_completed = true;
+       if (waitqueue_active(&msgbuf->ioctl_resp_wait))
                wake_up(&msgbuf->ioctl_resp_wait);
-       }
 }