From patchwork Wed Apr 5 10:32:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96821 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196106qgd; Wed, 5 Apr 2017 03:33:40 -0700 (PDT) X-Received: by 10.84.197.3 with SMTP id m3mr35215754pld.89.1491388420245; Wed, 05 Apr 2017 03:33:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si20271056pli.143.2017.04.05.03.33.40; Wed, 05 Apr 2017 03:33:40 -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 S933488AbdDEKdh (ORCPT + 6 others); Wed, 5 Apr 2017 06:33:37 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35502 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933059AbdDEKda (ORCPT ); Wed, 5 Apr 2017 06:33:30 -0400 Received: by mail-pf0-f180.google.com with SMTP id i5so5593763pfc.2 for ; Wed, 05 Apr 2017 03:33:30 -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:in-reply-to:references; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=XBpUOQA5ENLfp5Iv1R4K4rGrc746klITtsMDJ5T006aYHHME52k4rtPThypPQHlKbt iG/CkYFERJcfcLXoEWOWx6G1zZqtTSeb2dmF+V+Qka2dwaoMULzkR2c637xCqc6mkGBl nAWFeZ4XCnnZY66Q01TX+/Qf8QhUITrzNuHeM= 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:in-reply-to :references; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=iBaU1U0oc5jho3pkmbR4TivDHYCyqnYoXZ3tv7AVmyU2+uX5TfPdPtrtHFjLR4weIy aM3CxPtwUSv1KhzNO1M2gslRLQ33oZlJ5B7HbOq+Hx6v6ouYQS1RItGIyMX4ETkPzlak IwTuIBB19DATajM1FmwJ0Q9kUOJ2Y916jo46P3kXJpW0O9eA2zVWejRGGnIuJWIivasn nmoA+d9hJlkDZWZrbeITt9J1UcTpT3rKQQZrA58CYhNrxn0vgo9L25sXTPfbi+hDfZOp ERkwGt7Ems2theeH0ichq/hvGJQPqt7y6K5p2PpK8E1iKE5wutKpEZ48Dc1r/Bqe1Juz /vhg== X-Gm-Message-State: AFeK/H1ibgSCy0Lr+GLvwvhJVZ5VJ80jsiGE/R9xm9bIbhHK2DU1nwc0KhJ6O84b5rV6Oht/ X-Received: by 10.98.102.88 with SMTP id a85mr29367488pfc.33.1491388409988; Wed, 05 Apr 2017 03:33:29 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:29 -0700 (PDT) From: Amit Pundir To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, Stanislaw Gruszka , Vishal Thanki , Kalle Valo Subject: [PATCH v2 for-4.9 29/32] rt2x00usb: fix anchor initialization Date: Wed, 5 Apr 2017 16:02:21 +0530 Message-Id: <1491388344-13521-30-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> References: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> 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);