diff options
| author | David Ahern <dsahern@kernel.org> | 2022-01-03 20:19:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-11 17:23:33 +0300 |
| commit | c94999cfbbbe66a08f31cd6ca1abefed7839c3ec (patch) | |
| tree | aa313cc4aff475e76b84a2729cdc66818757fba6 | |
| parent | 2a6a811a45fde5acb805ead4d1e942be3875b302 (diff) | |
| download | linux-c94999cfbbbe66a08f31cd6ca1abefed7839c3ec.tar.xz | |
ipv6: Continue processing multipath route even if gateway attribute is invalid
[ Upstream commit e30a845b0376eb51c9c94f56bbd53b2e08ba822f ]
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: 1ff15a710a86 ("ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route")
Signed-off-by: David Ahern <dsahern@kernel.org>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://lore.kernel.org/r/20220103171911.94739-1-dsahern@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/ipv6/route.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 53861f9c8ce0..56f0783df589 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5313,8 +5313,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; } @@ -5323,6 +5325,7 @@ static int ip6_route_multipath_del(struct fib6_config *cfg, if (err) last_err = err; +next_rtnh: rtnh = rtnh_next(rtnh, &remaining); } |