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

Commit ae2688d5 authored by Jianzhao Wang's avatar Jianzhao Wang Committed by David S. Miller
Browse files

net: blackhole route should always be recalculated 



Blackhole routes are used when xfrm_lookup() returns -EREMOTE (error
triggered by IKE for example), hence this kind of route is always
temporary and so we should check if a better route exists for next
packets.
Bug has been introduced by commit d11a4dc1.

Signed-off-by: default avatarJianzhao Wang <jianzhao.wang@6wind.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6b085b6

net/ipv4/route.c

+6 −1
Original line number Diff line number Diff line
@@ -2738,6 +2738,11 @@ int __ip_route_output_key(struct net *net, struct rtable **rp, 
}

EXPORT_SYMBOL_GPL(__ip_route_output_key);



static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie)

{

	return NULL;

}



static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu)

{

}
@@ -2746,7 +2751,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = { 
	.family			=	AF_INET,

	.protocol		=	cpu_to_be16(ETH_P_IP),

	.destroy		=	ipv4_dst_destroy,

	.check			=	ipv4_dst_check,

	.check			=	ipv4_blackhole_dst_check,

	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,

	.entries		=	ATOMIC_INIT(0),

};