* [PATCH] wl3501_cs: Add spinlock to wl3501_reset
@ 2016-08-02 9:41 Pavel Andrianov
2016-08-04 5:01 ` Vaishali Thakkar
2016-09-03 10:01 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Pavel Andrianov @ 2016-08-02 9:41 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Pavel Andrianov, Kalle Valo, linux-wireless, netdev, linux-kernel,
ldv-project, vaishali.thakkar
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 <andrianov@ispras.ru>
---
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);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] wl3501_cs: Add spinlock to wl3501_reset
2016-08-02 9:41 [PATCH] wl3501_cs: Add spinlock to wl3501_reset Pavel Andrianov
@ 2016-08-04 5:01 ` Vaishali Thakkar
2016-09-03 10:01 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Vaishali Thakkar @ 2016-08-04 5:01 UTC (permalink / raw)
To: Pavel Andrianov, Arnaldo Carvalho de Melo
Cc: Kalle Valo, linux-wireless, netdev, linux-kernel, ldv-project
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 <andrianov@ispras.ru>
Acked-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: wl3501_cs: Add spinlock to wl3501_reset
2016-08-02 9:41 [PATCH] wl3501_cs: Add spinlock to wl3501_reset Pavel Andrianov
2016-08-04 5:01 ` Vaishali Thakkar
@ 2016-09-03 10:01 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2016-09-03 10:01 UTC (permalink / raw)
To: Pavel Andrianov
Cc: Arnaldo Carvalho de Melo, Pavel Andrianov, linux-wireless, netdev,
linux-kernel, ldv-project, vaishali.thakkar
Pavel Andrianov <andrianov@ispras.ru> 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 <andrianov@ispras.ru>
> Acked-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
Thanks, 1 patch applied to wireless-drivers-next.git:
bd6b0242652a wl3501_cs: Add spinlock to wl3501_reset
--
Sent by pwcli
https://patchwork.kernel.org/patch/9255415/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-03 10:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-02 9:41 [PATCH] wl3501_cs: Add spinlock to wl3501_reset Pavel Andrianov
2016-08-04 5:01 ` Vaishali Thakkar
2016-09-03 10:01 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).