From patchwork Wed Apr 5 10:32:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96823 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196225qgd; Wed, 5 Apr 2017 03:34:02 -0700 (PDT) X-Received: by 10.98.79.65 with SMTP id d62mr27514722pfb.64.1491388442549; Wed, 05 Apr 2017 03:34:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f19si16121799pgk.27.2017.04.05.03.34.02; Wed, 05 Apr 2017 03:34:02 -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 S933492AbdDEKdj (ORCPT + 6 others); Wed, 5 Apr 2017 06:33:39 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:36446 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933469AbdDEKd2 (ORCPT ); Wed, 5 Apr 2017 06:33:28 -0400 Received: by mail-pg0-f49.google.com with SMTP id g2so5940830pge.3 for ; Wed, 05 Apr 2017 03:33:28 -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=PCYY+IhJASKbsIhTOvS70uMqhXXK8MAsIpBq+FYE6VI=; b=i/e6B/nH+DcILdls1+8TkwEjbKDVxTw68cUCCRtiRV24ea3l7ObUkiOb1d5zJ0tFNG deDkL6e9NgqFGVvieNLigEH1QwkyqT3ALJ/KU11P4bA0K+Z8C5Mxoc5OF4rLtw9b3f/e LCmI3CpcqnsJMbGypTLVwhKOJEZ0wRhp/V2Dg= 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=PCYY+IhJASKbsIhTOvS70uMqhXXK8MAsIpBq+FYE6VI=; b=YMZofnNpk90JNzWD16ke9LeXtPUBFdg2McpZfoNeydpnOjaxxR7J96UfHUm07+46zx Lo5TySOO80KI6Hf8HVzAW8zCRU932f4l/pnFJ8qqa4RQuQHMQD/lTMDWyYSSKVOsyLn5 HfjOIT7NBV1u6VviCmcTLNpOpsbxQSzqjQ41d+SKpeFHntE5ws26IjT2UEPIseuZ9vsf oWGC+2YlWmc1nWgG6YPOTuBJFQGK1k6wAl79GoBtanVc9uSOfJkjiF+3OHV8eSEhoU32 HuDj15n4x8vg2YbNOH9qBW5n9CO5nW8Lx6o8BZz303OC/BCMRcf2Wjbr2M+o3PXi12OA ndXw== X-Gm-Message-State: AFeK/H3PmlPvv2X6lhQ5CGhfmvf8GsUQjOmVdHapH9wpdUU3nErYuEe9AkmrTuiq9A4hz+EV X-Received: by 10.98.129.195 with SMTP id t186mr28672961pfd.130.1491388407745; Wed, 05 Apr 2017 03:33:27 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:27 -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 28/32] rt2x00usb: do not anchor rx and tx urb's Date: Wed, 5 Apr 2017 16:02:20 +0530 Message-Id: <1491388344-13521-29-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 We might kill TX or RX urb during rt2x00usb_flush_entry(), what can cause anchor list corruption like shown below: [ 2074.035633] WARNING: CPU: 2 PID: 14480 at lib/list_debug.c:33 __list_add+0xac/0xc0 [ 2074.035634] list_add corruption. prev->next should be next (ffff88020f362c28), but was dead000000000100. (prev=ffff8801d161bb70). [ 2074.035670] Call Trace: [ 2074.035672] [] dump_stack+0x63/0x8c [ 2074.035674] [] __warn+0xd1/0xf0 [ 2074.035676] [] warn_slowpath_fmt+0x5f/0x80 [ 2074.035678] [] ? rt2x00usb_register_write_lock+0x3d/0x60 [rt2800usb] [ 2074.035679] [] __list_add+0xac/0xc0 [ 2074.035681] [] usb_anchor_urb+0x4c/0xa0 [ 2074.035683] [] rt2x00usb_kick_rx_entry+0xaf/0x100 [rt2x00usb] [ 2074.035684] [] rt2x00usb_clear_entry+0x22/0x30 [rt2x00usb] To fix do not anchor TX and RX urb's, it is not needed as during shutdown we kill those urbs in rt2x00usb_free_entries(). 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 93c7018ec16bb83399dd4db61c361a6d6aba0d5a) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index 6005e14..efe2501 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void *data) entry->skb->data, length, rt2x00usb_interrupt_txdone, entry); - usb_anchor_urb(entry_priv->urb, rt2x00dev->anchor); status = usb_submit_urb(entry_priv->urb, GFP_ATOMIC); if (status) { - usb_unanchor_urb(entry_priv->urb); if (status == -ENODEV) clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); set_bit(ENTRY_DATA_IO_FAILED, &entry->flags); @@ -410,10 +408,8 @@ static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void *data) entry->skb->data, entry->skb->len, rt2x00usb_interrupt_rxdone, entry); - usb_anchor_urb(entry_priv->urb, rt2x00dev->anchor); status = usb_submit_urb(entry_priv->urb, GFP_ATOMIC); if (status) { - usb_unanchor_urb(entry_priv->urb); if (status == -ENODEV) clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); set_bit(ENTRY_DATA_IO_FAILED, &entry->flags);