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

Commit a4731138 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix __neigh_event_send() 



commit 7fee226a (net: add a noref bit on skb dst) missed one spot
where an skb is enqueued, with a possibly not refcounted dst entry.

__neigh_event_send() inserts skb into arp_queue, so we must make sure
dst entry is refcounted, or dst entry can be freed by garbage collector
after caller exits from rcu protected section.

Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Tested-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a02c3789

net/core/neighbour.c

+1 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) 
				kfree_skb(buff);

				NEIGH_CACHE_STAT_INC(neigh->tbl, unres_discards);

			}

			skb_dst_force(skb);

			__skb_queue_tail(&neigh->arp_queue, skb);

		}

		rc = 1;