Skip to content

Commit

Permalink
ipv6: Do cleanup if attribute validation fails in multipath route
Browse files Browse the repository at this point in the history
[ Upstream commit 95bdba2 ]

As Nicolas noted, if gateway validation fails walking the multipath
attribute the code should jump to the cleanup to free previously
allocated memory.

Fixes: 1ff15a7 ("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>
  • Loading branch information
dsahern authored and gregkh committed Jan 11, 2022
1 parent c1de618 commit 8a7520c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions net/ipv6/route.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 8a7520c

Please sign in to comment.