summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <koct9i@gmail.com>2015-11-30 23:14:48 +0100
committerDavid S. Miller <davem@davemloft.net>2015-12-03 06:07:51 +0100
commit6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e (patch)
tree757beceaf7d992f37b769d6ac0cd643879279046 /net/core
parentsctp: use GFP_USER for user-controlled kmalloc (diff)
downloadlinux-6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e.tar.xz
linux-6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e.zip
net/neighbour: fix crash at dumping device-agnostic proxy entries
Proxy entries could have null pointer to net-device. Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com> Fixes: 84920c1420e2 ("net: Allow ipv6 proxies and arp proxies be shown with iproute2") Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/neighbour.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e6af42da28d9..f18ae91b652e 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2215,7 +2215,7 @@ static int pneigh_fill_info(struct sk_buff *skb, struct pneigh_entry *pn,
ndm->ndm_pad2 = 0;
ndm->ndm_flags = pn->flags | NTF_PROXY;
ndm->ndm_type = RTN_UNICAST;
- ndm->ndm_ifindex = pn->dev->ifindex;
+ ndm->ndm_ifindex = pn->dev ? pn->dev->ifindex : 0;
ndm->ndm_state = NUD_NONE;
if (nla_put(skb, NDA_DST, tbl->key_len, pn->key))
@@ -2333,7 +2333,7 @@ static int pneigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
if (h > s_h)
s_idx = 0;
for (n = tbl->phash_buckets[h], idx = 0; n; n = n->next) {
- if (dev_net(n->dev) != net)
+ if (pneigh_net(n) != net)
continue;
if (idx < s_idx)
goto next;