diff options
| author | David Ahern <dsahern@kernel.org> | 2022-01-03 10:05:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-11 15:35:17 +0100 |
| commit | 8a7520c49994ab1d43221e6445252e9fad0b3391 (patch) | |
| tree | 60740476302b3c80c783d7a0e6b333da3eee5c3d | |
| parent | c1de618c95e9954b6e54384cca027abf8103c8f5 (diff) | |
| download | linux-stable-8a7520c49994ab1d43221e6445252e9fad0b3391.tar.gz linux-stable-8a7520c49994ab1d43221e6445252e9fad0b3391.tar.bz2 linux-stable-8a7520c49994ab1d43221e6445252e9fad0b3391.zip | |
ipv6: Do cleanup if attribute validation fails in multipath route
[ Upstream commit 95bdba23b5b4aa75fe3e6c84335e638641c707bb ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 0eceb0e88976..0632382a5427 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; } |