diff options
| author | Konstantin Khlebnikov <koct9i@gmail.com> | 2015-12-01 01:14:48 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:30 +0800 |
| commit | cb4a1131acf864b83c575478b16fc8485d4be1ae (patch) | |
| tree | 801d7fc3f6fb7ab9ed03a8a8763e7697c1aae959 | |
| parent | 468992e1e827feac0e1304b131a24679e7830958 (diff) | |
| download | lwn-cb4a1131acf864b83c575478b16fc8485d4be1ae.tar.gz lwn-cb4a1131acf864b83c575478b16fc8485d4be1ae.zip | |
net/neighbour: fix crash at dumping device-agnostic proxy entries
commit 6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e upstream.
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>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | net/core/neighbour.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index ebd4b21cb9d4..dbd00dfbc6ce 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2186,7 +2186,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 = NDA_DST; - ndm->ndm_ifindex = pn->dev->ifindex; + ndm->ndm_ifindex = pn->dev ? pn->dev->ifindex : 0; ndm->ndm_state = NUD_NONE; NLA_PUT(skb, NDA_DST, tbl->key_len, pn->key); @@ -2259,7 +2259,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; |