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>
This commit is contained in:
David Ahern 2022-01-03 10:05:55 -07:00 committed by Greg Kroah-Hartman
parent c94999cfbb
commit f0e5709824
1 changed files with 3 additions and 5 deletions

View File

@ -5146,12 +5146,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;
}