net: neigh: guard against NULL solicit() method
commit 48481c8fa16410ffa45939b13b6c53c2ca609e5f upstream. Dmitry posted a nice reproducer of a bug triggering in neigh_probe() when dereferencing a NULL neigh->ops->solicit method. This can happen for arp_direct_ops/ndisc_direct_ops and similar, which can be used for NUD_NOARP neighbours (created when dev->header_ops is NULL). Admin can then force changing nud_state to some other state that would fire neigh timer. Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Willy Tarreau <w@1wt.eu>
This commit is contained in:
parent
6600ef91b0
commit
12fb6fdb3f
|
@ -873,7 +873,8 @@ static void neigh_probe(struct neighbour *neigh)
|
||||||
if (skb)
|
if (skb)
|
||||||
skb = skb_copy(skb, GFP_ATOMIC);
|
skb = skb_copy(skb, GFP_ATOMIC);
|
||||||
write_unlock(&neigh->lock);
|
write_unlock(&neigh->lock);
|
||||||
neigh->ops->solicit(neigh, skb);
|
if (neigh->ops->solicit)
|
||||||
|
neigh->ops->solicit(neigh, skb);
|
||||||
atomic_inc(&neigh->probes);
|
atomic_inc(&neigh->probes);
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue