Skip to content

Commit 969447f

Browse files
ssuryaputradavem330
authored andcommitted
ipv4: use new_gw for redirect neigh lookup
In v2.6, ip_rt_redirect() calls arp_bind_neighbour() which returns 0 and then the state of the neigh for the new_gw is checked. If the state isn't valid then the redirected route is deleted. This behavior is maintained up to v3.5.7 by check_peer_redirect() because rt->rt_gateway is assigned to peer->redirect_learned.a4 before calling ipv4_neigh_lookup(). After commit 5943634 ("ipv4: Maintain redirect and PMTU info in struct rtable again."), ipv4_neigh_lookup() is performed without the rt_gateway assigned to the new_gw. In the case when rt_gateway (old_gw) isn't zero, the function uses it as the key. The neigh is most likely valid since the old_gw is the one that sends the ICMP redirect message. Then the new_gw is assigned to fib_nh_exception. The problem is: the new_gw ARP may never gets resolved and the traffic is blackholed. So, use the new_gw for neigh lookup. Changes from v1: - use __ipv4_neigh_lookup instead (per Eric Dumazet). Fixes: 5943634 ("ipv4: Maintain redirect and PMTU info in struct rtable again.") Signed-off-by: Stephen Suryaputra Lin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ca0a753 commit 969447f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/ipv4/route.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,9 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow
753753
goto reject_redirect;
754754
}
755755

756-
n = ipv4_neigh_lookup(&rt->dst, NULL, &new_gw);
756+
n = __ipv4_neigh_lookup(rt->dst.dev, new_gw);
757+
if (!n)
758+
n = neigh_create(&arp_tbl, &new_gw, rt->dst.dev);
757759
if (!IS_ERR(n)) {
758760
if (!(n->nud_state & NUD_VALID)) {
759761
neigh_event_send(n, NULL);

0 commit comments

Comments
 (0)