| Message ID | 20220103171911.94739-1-dsahern@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipv6: Continue processing multipath route even if gateway attribute is invalid | expand |
Le 03/01/2022 à 18:19, David Ahern a écrit : > ip6_route_multipath_del loop continues processing the multipath > attribute even if delete of a nexthop path fails. For consistency, > do the same if the gateway attribute is invalid. > > Fixes: d5297ac885b5 ("ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route") > Signed-off-by: David Ahern <dsahern@kernel.org> > Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Thanks for the follow up.
On Mon, 3 Jan 2022 18:31:03 +0100 Nicolas Dichtel wrote: > Le 03/01/2022 à 18:19, David Ahern a écrit : > > ip6_route_multipath_del loop continues processing the multipath > > attribute even if delete of a nexthop path fails. For consistency, > > do the same if the gateway attribute is invalid. > > > > Fixes: d5297ac885b5 ("ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route") > > Signed-off-by: David Ahern <dsahern@kernel.org> > > Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Fixed the commit ID and applied, thanks!
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 3f36f9603f00..1deb6297aab6 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5457,8 +5457,10 @@ static int ip6_route_multipath_del(struct fib6_config *cfg, if (nla) { err = fib6_gw_from_attr(&r_cfg.fc_gateway, nla, extack); - if (err) - return err; + if (err) { + last_err = err; + goto next_rtnh; + } r_cfg.fc_flags |= RTF_GATEWAY; } @@ -5467,6 +5469,7 @@ static int ip6_route_multipath_del(struct fib6_config *cfg, if (err) last_err = err; +next_rtnh: rtnh = rtnh_next(rtnh, &remaining); }
ip6_route_multipath_del loop continues processing the multipath attribute even if delete of a nexthop path fails. For consistency, do the same if the gateway attribute is invalid. Fixes: d5297ac885b5 ("ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route") Signed-off-by: David Ahern <dsahern@kernel.org> Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- net/ipv6/route.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)