summaryrefslogtreecommitdiffstats
path: root/net/core/netpoll.c
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-08-10 03:24:40 +0200
committerDavid S. Miller <davem@davemloft.net>2012-08-14 23:33:31 +0200
commit57c5d46191e75312934c00eba65b13a31ca95120 (patch)
tree18eb9488b414f0dacdf7be468985a29ceeb1f2e9 /net/core/netpoll.c
parentnetconsole: do not release spin_lock when calling __netpoll_cleanup (diff)
downloadlinux-57c5d46191e75312934c00eba65b13a31ca95120.tar.xz
linux-57c5d46191e75312934c00eba65b13a31ca95120.zip
netpoll: take rcu_read_lock_bh() in netpoll_rx()
In __netpoll_rx(), it dereferences ->npinfo without rcu_dereference_bh(), this patch fixes it by using the 'npinfo' passed from netpoll_rx() where it is already dereferenced with rcu_dereference_bh(). Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r--net/core/netpoll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index dc17f1db1479..d055bb01328b 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -543,13 +543,12 @@ static void arp_reply(struct sk_buff *skb)
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
}
-int __netpoll_rx(struct sk_buff *skb)
+int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo)
{
int proto, len, ulen;
int hits = 0;
const struct iphdr *iph;
struct udphdr *uh;
- struct netpoll_info *npinfo = skb->dev->npinfo;
struct netpoll *np, *tmp;
if (list_empty(&npinfo->rx_np))