diff options
| author | David Ahern <dsahern@kernel.org> | 2022-01-03 18:05:55 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-01-03 19:04:42 +0100 |
| commit | 95bdba23b5b4aa75fe3e6c84335e638641c707bb (patch) | |
| tree | ae9accb45b617390b8a94e8db135ba8eeb550a73 /net | |
| parent | ipv6: Continue processing multipath route even if gateway attribute is invalid (diff) | |
| download | linux-95bdba23b5b4aa75fe3e6c84335e638641c707bb.tar.xz linux-95bdba23b5b4aa75fe3e6c84335e638641c707bb.zip | |
ipv6: Do cleanup if attribute validation fails in multipath route
As Nicolas noted, if gateway validation fails walking the multipath
attribute the code should jump to the cleanup to free previously
allocated memory.
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/20220103170555.94638-1-dsahern@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 087df86c15d1..1deb6297aab6 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5277,12 +5277,10 @@ static int ip6_route_multipath_add(struct fib6_config *cfg, nla = nla_find(attrs, attrlen, RTA_GATEWAY); if (nla) { - int ret; - - ret = fib6_gw_from_attr(&r_cfg.fc_gateway, nla, + err = fib6_gw_from_attr(&r_cfg.fc_gateway, nla, extack); - if (ret) - return ret; + if (err) + goto cleanup; r_cfg.fc_flags |= RTF_GATEWAY; } |