Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c103ad authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Sasha Levin
Browse files

net/neighbour: fix crash at dumping device-agnostic proxy entries 



[ Upstream commit 6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e ]

Proxy entries could have null pointer to net-device.

Signed-off-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
Fixes: 84920c14 ("net: Allow ipv6 proxies and arp proxies be shown with iproute2")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 46ddb98e

net/core/neighbour.c

+2 −2
Original line number Diff line number Diff line
@@ -2263,7 +2263,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))
@@ -2337,7 +2337,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;