]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv6: Fix RTA_MULTIPATH with nexthop objects
authorDavid Ahern <dsahern@gmail.com>
Tue, 3 Sep 2019 22:22:12 +0000 (15:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2019 09:59:39 +0000 (11:59 +0200)
A change to the core nla helpers was missed during the push of
the nexthop changes. rt6_fill_node_nexthop should be calling
nla_nest_start_noflag not nla_nest_start. Currently, iproute2
does not print multipath data because of parsing issues with
the attribute.

Fixes: f88d8ea67fbd ("ipv6: Plumb support for nexthop object in a fib6_info")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index 2927e72e511a575ba503fb909b73696d8d22ca84..977cfd09e2a329bad2ab559c5b67c66fa0149e8b 100644 (file)
@@ -5329,7 +5329,7 @@ static int rt6_fill_node_nexthop(struct sk_buff *skb, struct nexthop *nh,
        if (nexthop_is_multipath(nh)) {
                struct nlattr *mp;
 
-               mp = nla_nest_start(skb, RTA_MULTIPATH);
+               mp = nla_nest_start_noflag(skb, RTA_MULTIPATH);
                if (!mp)
                        goto nla_put_failure;