diff options
| author | Pavel Emelyanov | 2009-05-11 02:36:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-05-18 05:37:55 +0200 |
| commit | 5e392739d6ab72f7c35040aa07f4097904bce6e7 (patch) | |
| tree | 3c363f0733de8f6f843280f84c68ee57695f0c39 | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| download | kernel-qcow2-linux-5e392739d6ab72f7c35040aa07f4097904bce6e7.tar.gz kernel-qcow2-linux-5e392739d6ab72f7c35040aa07f4097904bce6e7.tar.xz kernel-qcow2-linux-5e392739d6ab72f7c35040aa07f4097904bce6e7.zip | |
netpoll: don't dereference NULL dev from np
It looks like the dev in netpoll_poll can be NULL - at lease it's
checked at the function beginning. Thus the dev->netde_ops dereference
looks dangerous.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/netpoll.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index b5873bdff612..64f51eec6576 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -175,9 +175,13 @@ static void service_arp_queue(struct netpoll_info *npi) void netpoll_poll(struct netpoll *np) { struct net_device *dev = np->dev; - const struct net_device_ops *ops = dev->netdev_ops; + const struct net_device_ops *ops; + + if (!dev || !netif_running(dev)) + return; - if (!dev || !netif_running(dev) || !ops->ndo_poll_controller) + ops = dev->netdev_ops; + if (!ops->ndo_poll_controller) return; /* Process pending work on NIC */ |