From patchwork Tue Apr 4 06:18:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96692 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48381qgd; Mon, 3 Apr 2017 23:18:45 -0700 (PDT) X-Received: by 10.98.137.204 with SMTP id n73mr20654643pfk.5.1491286725524; Mon, 03 Apr 2017 23:18:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.45; Mon, 03 Apr 2017 23:18:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbdDDGSo (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:44 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33566 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbdDDGSo (ORCPT ); Tue, 4 Apr 2017 02:18:44 -0400 Received: by mail-pg0-f48.google.com with SMTP id x125so142570309pgb.0 for ; Mon, 03 Apr 2017 23:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=a46raFf00Jgf4GPCm7LLS/nxscm6Rt2G0jAHA8WTtOkbTsgdOyGqIr3Q2jvMSbONPL dTwDFSoo3G7k/PGVWHr/uHQPlitgcQgIdNxkr0HNlZjFumYN6aN99F6LnAlpgzQXXP7r 5aphmJ6+fhx4J7/1op5aqV6O2ctJJLB/kfMOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=rNN71yD42v0T9kuj51Zb6qVL/4mov7pS+doRNxRuV6qkFGS5C3qUr5B8Rtk3TVYOlu bz84xuHHdx6Gjk3RIlNcLBtGU4SiIDhBwI7H07pKB0VctXGrc35j3Uq0wCq3kcdJMvAx 4geTRbl5j9hd2O9cA4pc0bSh7GQnVzA4KH7eyc+DfbfUtdEbmU9z80cznGRKqyWsLmnZ RzI5+U9G/zZjDrcI4F+XDg8b6NLIDMZeqNftzRe7KNcQX1jD/zXUN7E7Vzq0YX7CBTDC EyM+TRSMhym7BPrcdQ3D8/110Ay0QLHVATSDmfMXtRJFMH93POE0OVP/j8xvGMnmCjhS rjOA== X-Gm-Message-State: AFeK/H1iQdoXOGmtvdO3jj+HWcfNOd46WxnItv+GueSRGJVFfMvKEhsd+Sw0fsUThON60EXo X-Received: by 10.84.149.168 with SMTP id m37mr26895709pla.97.1491286723642; Mon, 03 Apr 2017 23:18:43 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y70sm29190878pfa.96.2017.04.03.23.18.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:42 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Stanislaw Gruszka , Vishal Thanki , Kalle Valo Subject: [PATCH 30/33] rt2x00usb: fix anchor initialization Date: Tue, 4 Apr 2017 11:48:36 +0530 Message-Id: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanislaw Gruszka If device fail to initialize we can OOPS in rt2x00lib_remove_dev(), due to using uninitialized usb_anchor structure: [ 855.435820] ieee80211 phy3: rt2x00usb_vendor_request: Error - Vendor Request 0x07 failed for offset 0x1000 with error -19 [ 855.435826] ieee80211 phy3: rt2800_probe_rt: Error - Invalid RT chipset 0x0000, rev 0000 detected [ 855.435829] ieee80211 phy3: rt2x00lib_probe_dev: Error - Failed to allocate device [ 855.435845] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 [ 855.435900] IP: _raw_spin_lock_irq+0xd/0x30 [ 855.435926] PGD 0 [ 855.435953] Oops: 0002 [#1] SMP [ 855.437011] Call Trace: [ 855.437029] ? usb_kill_anchored_urbs+0x27/0xc0 [ 855.437061] rt2x00lib_remove_dev+0x190/0x1c0 [rt2x00lib] [ 855.437097] rt2x00lib_probe_dev+0x246/0x7a0 [rt2x00lib] [ 855.437149] ? ieee80211_roc_setup+0x9e/0xd0 [mac80211] [ 855.437183] ? __kmalloc+0x1af/0x1f0 [ 855.437207] ? rt2x00usb_probe+0x13d/0xc50 [rt2x00usb] [ 855.437240] rt2x00usb_probe+0x155/0xc50 [rt2x00usb] [ 855.437273] rt2800usb_probe+0x15/0x20 [rt2800usb] [ 855.437304] usb_probe_interface+0x159/0x2d0 [ 855.437333] driver_probe_device+0x2bb/0x460 Patch changes initialization sequence to fix the problem. Cc: Vishal Thanki Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Stanislaw Gruszka Signed-off-by: Kalle Valo (cherry picked from commit 0488a6121dfe6cbd44de15ea3627913b7549a1e9) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index efe2501..662705e 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -820,10 +820,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, if (retval) goto exit_free_device; - retval = rt2x00lib_probe_dev(rt2x00dev); - if (retval) - goto exit_free_reg; - rt2x00dev->anchor = devm_kmalloc(&usb_dev->dev, sizeof(struct usb_anchor), GFP_KERNEL); @@ -831,10 +827,17 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, retval = -ENOMEM; goto exit_free_reg; } - init_usb_anchor(rt2x00dev->anchor); + + retval = rt2x00lib_probe_dev(rt2x00dev); + if (retval) + goto exit_free_anchor; + return 0; +exit_free_anchor: + usb_kill_anchored_urbs(rt2x00dev->anchor); + exit_free_reg: rt2x00usb_free_reg(rt2x00dev);