From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9D0BC2BA19 for ; Sat, 11 Apr 2020 23:15:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC27420757 for ; Sat, 11 Apr 2020 23:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646930; bh=qMewOPqG0o5oxG+ZYCQaeBQiCPk5WLpbeEM93ZN/vKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I7SddvvhYr/Bk37HyDJvvUpcX3C86qHMKtGo3tOA+IgrbvjUzRPLKw3cAmCPFefyt AYYJZC+fyaYgKKpmbJm2uAG/4CxeqKbCmgtrcuCgMxIWwdjecdZkRJWP4F9WYvi9KA nrBhxg56ea2tmMPxmr9kSL0dtHZXRFx3J8vz/LKU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729595AbgDKXPY (ORCPT ); Sat, 11 Apr 2020 19:15:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:57358 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730548AbgDKXPE (ORCPT ); Sat, 11 Apr 2020 19:15:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 103632084D; Sat, 11 Apr 2020 23:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646904; bh=qMewOPqG0o5oxG+ZYCQaeBQiCPk5WLpbeEM93ZN/vKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qp+ThtzkUQRXwvInZpskDd33iuRSB8ZU4ft74maxy9JquUgadPVZdyau/4fxQg9Hc 7woe4tDBTJ5Hbfe/eXaxQ5oo70Ikv0oplD94LXsA34WaeVfngdVDVnUOCZNSjiaQAk pzW82/VEwKHrSVig0aHD4jQvpHF4/IfgVRLRyHp0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Raveendran Somu , Chi-hsien Lin , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 14/16] brcmfmac: Fix driver crash on USB control transfer timeout Date: Sat, 11 Apr 2020 19:14:44 -0400 Message-Id: <20200411231447.27182-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231447.27182-1-sashal@kernel.org> References: <20200411231447.27182-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Raveendran Somu [ Upstream commit 93a5bfbc7cad8bf3dea81c9bc07761c1226a0860 ] 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 Signed-off-by: Chi-hsien Lin Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/1585124429-97371-2-git-send-email-chi-hsien.lin@cypress.com Signed-off-by: Sasha Levin --- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 2cb3f12dccbd8..a4eb1ef18143f 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -324,11 +324,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; } @@ -354,11 +355,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 -- 2.20.1