From: David Ahern <dsahern@gmail.com>
Date: Tue, 3 Sep 2019 22:22:12 +0000 (-0700)
Subject: ipv6: Fix RTA_MULTIPATH with nexthop objects
X-Git-Tag: v5.15~5584^2~40^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4255ff0544ee307e9a8acf66000e6fd49e9203f8;p=mirror_ubuntu-kernels.git

ipv6: Fix RTA_MULTIPATH with nexthop objects

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>
---

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 2927e72e511a..977cfd09e2a3 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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;