Skip to contentSkip to conversation

ipv6: Continue processing multipath route even if gateway attribute is invalid

PATCH In review David Ahern 3 participants 3 messages Jan 3, 2022

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

David Ahern

author maintainer
#0 lore raw

PATCH 1/1 ipv6: Continue processing multipath route even if gateway attribute is invalid

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 <[email protected]>
Cc Nicolas Dichtel <[email protected]>
---
 net/ipv6/route.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
net/ipv6/route.c +5 -2
index 3f36f9603f00..1deb6297aab6 100644
@@ -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);
 	}
Signature · 1 line
2.24.3 (Apple Git-128)
Acked-by on v1 1/1
#1 lore raw

Le 03/01/2022 à 18:19, David Ahern a écrit :

Quoted 7 lines

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 <[email protected]>
Cc Nicolas Dichtel <[email protected]>
Acked-by Nicolas Dichtel <[email protected]>

Thanks for the follow up.

maintainer
#2 lore raw
Quoted 9 lines · On Mon, 3 Jan 2022 18:31:03 +0100 Nicolas Dichtel wrote:

Le 03/01/2022 à 18:19, David Ahern a écrit :

Quoted 7 lines

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 <[email protected]>
Cc Nicolas Dichtel <[email protected]>
Acked-by Nicolas Dichtel <[email protected]>

Fixed the commit ID and applied, thanks!