diff options
| author | Raveendran Somu <raveendran.somu@cypress.com> | 2020-03-25 03:20:24 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-03-26 11:43:45 +0200 |
| commit | 93a5bfbc7cad8bf3dea81c9bc07761c1226a0860 (patch) | |
| tree | ab50909177228c8d34929afcb73e6a1a3c45d2ec | |
| parent | 0985d3a410ace005ce62666b67c9372dfc14bd7f (diff) | |
| download | linux-93a5bfbc7cad8bf3dea81c9bc07761c1226a0860.tar.gz linux-93a5bfbc7cad8bf3dea81c9bc07761c1226a0860.tar.bz2 linux-93a5bfbc7cad8bf3dea81c9bc07761c1226a0860.zip | |
brcmfmac: Fix driver crash on USB control transfer timeout
When the control transfer gets timed out, the error status
was returned without killing that urb, this leads to using
the same urb. This issue causes the kernel crash as the same
urb is sumbitted multiple times. The fix is to kill the
urb for timeout transfer before returning error
Signed-off-by: Raveendran Somu <raveendran.somu@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1585124429-97371-2-git-send-email-chi-hsien.lin@cypress.com
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index 575ed19e9195..10387a7f5d56 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -328,11 +328,12 @@ static int brcmf_usb_tx_ctlpkt(struct device *dev, u8 *buf, u32 len) return err; } timeout = brcmf_usb_ioctl_resp_wait(devinfo); - clear_bit(0, &devinfo->ctl_op); if (!timeout) { brcmf_err("Txctl wait timed out\n"); + usb_kill_urb(devinfo->ctl_urb); err = -EIO; } + clear_bit(0, &devinfo->ctl_op); return err; } @@ -358,11 +359,12 @@ static int brcmf_usb_rx_ctlpkt(struct device *dev, u8 *buf, u32 len) } timeout = brcmf_usb_ioctl_resp_wait(devinfo); err = devinfo->ctl_urb_status; - clear_bit(0, &devinfo->ctl_op); if (!timeout) { brcmf_err("rxctl wait timed out\n"); + usb_kill_urb(devinfo->ctl_urb); err = -EIO; } + clear_bit(0, &devinfo->ctl_op); if (!err) return devinfo->ctl_urb_actual_length; else |