lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 27 Mar 2008 08:23:13 -0400 From: Jeff Garzik <jeff@...zik.org> To: akpm@...ux-foundation.org CC: netdev@...r.kernel.org, mitov@...p.bas.bg, davem@...emloft.net Subject: Re: [patch for 2.6.25? 3/3] skge napi->poll() locking bug akpm@...ux-foundation.org wrote: > From: Marin Mitov <mitov@...p.bas.bg> > > According to: Documentation/networking/netdevices.txt: > > <cite> > napi->poll: > .......... > Context: softirq > will be called with interrupts disabled by netconsole. > </cite> > > napi->poll() could be called either with interrupts enabled > (in softirq context) or disabled (by netconsole), so the irq flag > should be preserved. > > Inspired by Ingo's resent forcedeth patch :-) > > Signed-off-by: Marin Mitov <mitov@...p.bas.bg> > Acked-by: David S. Miller <davem@...emloft.net> > Cc: Jeff Garzik <jeff@...zik.org> > Signed-off-by: Andrew Morton <akpm@...ux-foundation.org> > --- > > drivers/net/skge.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff -puN drivers/net/skge.c~skge-napi-poll-locking-bug drivers/net/skge.c > --- a/drivers/net/skge.c~skge-napi-poll-locking-bug > +++ a/drivers/net/skge.c > @@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct > skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START); > > if (work_done < to_do) { > - spin_lock_irq(&hw->hw_lock); > + unsigned long flags; > + > + spin_lock_irqsave(&hw->hw_lock, flags); > __netif_rx_complete(dev, napi); > hw->intr_mask |= napimask[skge->port]; > skge_write32(hw, B0_IMSK, hw->intr_mask); > skge_read32(hw, B0_IMSK); > - spin_unlock_irq(&hw->hw_lock); > + spin_unlock_irqrestore(&hw->hw_lock, flags); davem already has this -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists