From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from userp1040.oracle.com ([156.151.31.81]:39352 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751446AbcHDFFz (ORCPT ); Thu, 4 Aug 2016 01:05:55 -0400 Subject: Re: [PATCH] wl3501_cs: Add spinlock to wl3501_reset To: Pavel Andrianov , Arnaldo Carvalho de Melo References: <1470130913-5218-1-git-send-email-andrianov@ispras.ru> Cc: Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org From: Vaishali Thakkar Message-ID: <57A2CC35.60808@oracle.com> (sfid-20160804_070603_383032_11309A50) Date: Thu, 4 Aug 2016 10:31:41 +0530 MIME-Version: 1.0 In-Reply-To: <1470130913-5218-1-git-send-email-andrianov@ispras.ru> Content-Type: text/plain; charset=windows-1252 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tuesday 02 August 2016 03:11 PM, Pavel Andrianov wrote: > Likely wl3501_reset should acquire spinlock as wl3501_{open, close}. > One of calls of wl3501_reset has been already protected. > The others were unprotected and might lead to a race condition. > The patch adds spinlock into the wl3501_reset and removes it from > wl3501_tx_timeout. > > Found by Linux Driver Verification project (linuxtesting.org) > > Signed-off-by: Pavel Andrianov Acked-by: Vaishali Thakkar > --- > drivers/net/wireless/wl3501_cs.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c > index 13fd734..196f13c 100644 > --- a/drivers/net/wireless/wl3501_cs.c > +++ b/drivers/net/wireless/wl3501_cs.c > @@ -1247,7 +1247,9 @@ static int wl3501_reset(struct net_device *dev) > { > struct wl3501_card *this = netdev_priv(dev); > int rc = -ENODEV; > + unsigned long flags; > > + spin_lock_irqsave(&this->lock, flags); > wl3501_block_interrupt(this); > > if (wl3501_init_firmware(this)) { > @@ -1269,20 +1271,17 @@ static int wl3501_reset(struct net_device *dev) > pr_debug("%s: device reset", dev->name); > rc = 0; > out: > + spin_unlock_irqrestore(&this->lock, flags); > return rc; > } > > static void wl3501_tx_timeout(struct net_device *dev) > { > - struct wl3501_card *this = netdev_priv(dev); > struct net_device_stats *stats = &dev->stats; > - unsigned long flags; > int rc; > > stats->tx_errors++; > - spin_lock_irqsave(&this->lock, flags); > rc = wl3501_reset(dev); > - spin_unlock_irqrestore(&this->lock, flags); > if (rc) > printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n", > dev->name, rc); > -- Vaishali