* [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
@ 2008-09-26 2:33 Lin Tan
2008-09-27 21:44 ` Francois Romieu
0 siblings, 1 reply; 5+ messages in thread
From: Lin Tan @ 2008-09-26 2:33 UTC (permalink / raw)
To: linux-kernel
Fixing a datarace.
As indicated by the following comment, a lock must be held before calling
function update_stats(). This rule is followed in some cases, but not in
others. For example, the lock is held when the function is called in function
el3_get_stats(), but the lock is NOT held when called in el3_close(). It can
cause potential data races.
/*
...
Caller must hold the lock for this
*/
static void update_stats(struct net_device *dev)
{
...
}
Signed-off-by: Lin Tan <tammy000@gmail.com>
---
--- a/drivers/net/pcmcia/3c589_cs.c 2008-09-25 11:52:42.000000000 -0500
+++ b/drivers/net/pcmcia/3c589_cs.c 2008-09-25 13:01:44.000000000 -0500
@@ -920,6 +920,7 @@ static int el3_close(struct net_device *
struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev;
unsigned int ioaddr = dev->base_addr;
+ unsigned long flags;
DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
@@ -947,7 +948,9 @@ static int el3_close(struct net_device *
/* Check if the card still exists */
if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
+ spin_lock_irqsave(&lp->lock, flags);
update_stats(dev);
+ spin_unlock_irqrestore(&lp->lock, flags);
}
link->open--;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-26 2:33 [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Lin Tan
@ 2008-09-27 21:44 ` Francois Romieu
0 siblings, 0 replies; 5+ messages in thread
From: Francois Romieu @ 2008-09-27 21:44 UTC (permalink / raw)
To: Lin Tan; +Cc: linux-kernel
(Please Cc: netdev@vger.kernel.org)
Lin Tan <tammy000@gmail.com> :
[drivers/net/pcmcia/3c589_cs.c race]
> As indicated by the following comment, a lock must be held before calling
> function update_stats(). This rule is followed in some cases, but not in
> others. For example, the lock is held when the function is called in function
> el3_get_stats(), but the lock is NOT held when called in el3_close(). It can
> cause potential data races.
I would not bet that the irq handler does not race with el3_close()
in the first place. Could you dig it ?
--
Ueimor
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
2008-09-26 16:06 ` Tammy
@ 2008-09-26 17:31 ` Lin Tan
1 sibling, 0 replies; 5+ messages in thread
From: Lin Tan @ 2008-09-26 17:31 UTC (permalink / raw)
To: Komuro; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 31 bytes --]
Resending the corrected patch.
[-- Attachment #2: update_stats.readytosend --]
[-- Type: text/plain, Size: 1275 bytes --]
Fixing a datarace.
As indicated by the following comment, a lock must be held before calling
function update_stats(). This rule is followed in some cases, but not in
others. For example, the lock is held when the function is called in function
el3_get_stats(), but the lock is NOT held when called in el3_close(). It can
cause potential data races.
/*
...
Caller must hold the lock for this
*/
static void update_stats(struct net_device *dev)
{
...
}
Signed-off-by: Lin Tan <tammy000@gmail.com>
---
--- a/drivers/net/pcmcia/3c589_cs.c 2008-09-25 11:52:42.000000000 -0500
+++ b/drivers/net/pcmcia/3c589_cs.c 2008-09-26 11:07:04.000000000 -0500
@@ -920,6 +920,7 @@
struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev;
unsigned int ioaddr = dev->base_addr;
+ unsigned long flags;
DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
@@ -946,8 +947,11 @@
outw(0x0f00, ioaddr + WN0_IRQ);
/* Check if the card still exists */
- if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
+ if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
+ spin_lock_irqsave(&lp->lock, flags);
update_stats(dev);
+ spin_unlock_irqrestore(&lp->lock, flags);
+ }
}
link->open--;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
@ 2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
1 sibling, 0 replies; 5+ messages in thread
From: Tammy @ 2008-09-26 16:06 UTC (permalink / raw)
To: Komuro; +Cc: linux-kernel
> You need two braces...
>
> - if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
> + if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
> + spin_lock_irqsave(&lp->lock, flags);
> update_stats(dev);
> + spin_unlock_irqrestore(&lp->lock, flags);
> + }
> }
>
Thanks a lot. I will resubmit the patch then.
Lin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-22 23:15 ` Alan Cox
@ 2008-09-26 13:29 ` Komuro
2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
0 siblings, 2 replies; 5+ messages in thread
From: Komuro @ 2008-09-26 13:29 UTC (permalink / raw)
To: linux-kernel; +Cc: tammy000
Hi,
You need two braces...
- if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
+ if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
+ spin_lock_irqsave(&lp->lock, flags);
update_stats(dev);
+ spin_unlock_irqrestore(&lp->lock, flags);
+ }
}
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-09-27 21:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-26 2:33 [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Lin Tan
2008-09-27 21:44 ` Francois Romieu
-- strict thread matches above, loose matches on Subject: below --
2008-09-22 14:58 [PATCH] pcmcia: Fix broken abuse of dev->driver_data Alan Cox
2008-09-22 21:56 ` Dominik Brodowski
2008-09-22 22:12 ` Alan Cox
2008-09-22 22:26 ` Dominik Brodowski
2008-09-22 23:15 ` Alan Cox
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®