Commit f76936d0 authored Oct 13, 2014 by Jiri Pirko Committed by David S. Miller Oct 14, 2014

ipv4: fix nexthop attlen check in fib_nh_match



fib_nh_match does not match nexthops correctly. Example:

ip route add 172.16.10/24 nexthop via 192.168.122.12 dev eth0 \
                          nexthop via 192.168.122.13 dev eth0
ip route del 172.16.10/24 nexthop via 192.168.122.14 dev eth0 \
                          nexthop via 192.168.122.15 dev eth0

Del command is successful and route is removed. After this patch
applied, the route is correctly matched and result is:
RTNETLINK answers: No such process

Please consider this for stable trees as well.

Fixes: 4e902c57 ("[IPv4]: FIB configuration using struct fib_config")
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ad971f61

net/ipv4/fib_semantics.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -537,7 +537,7 @@ int fib_nh_match(struct fib_config cfg, struct fib_info fi)
	return 1;		return 1;

	attrlen = rtnh_attrlen(rtnh);		attrlen = rtnh_attrlen(rtnh);
	if (attrlen < 0) {		if (attrlen > 0) {
	struct nlattr nla, attrs = rtnh_attrs(rtnh);		struct nlattr nla, attrs = rtnh_attrs(rtnh);

	nla = nla_find(attrs, attrlen, RTA_GATEWAY);		nla = nla_find(attrs, attrlen, RTA_GATEWAY);