diff options
| author | David Ahern <dsahern@kernel.org> | 2021-12-30 17:36:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-11 15:25:00 +0100 |
| commit | 173bfa2782fa5ca3678e72133190eb1b22913bc9 (patch) | |
| tree | 6d6e45fd3f79b1521708fe75edb2ba605ee124c3 /net/ipv6 | |
| parent | 914420a2a6c5d72b9e9f0396a988810b6716b4b5 (diff) | |
| download | linux-stable-173bfa2782fa5ca3678e72133190eb1b22913bc9.tar.gz linux-stable-173bfa2782fa5ca3678e72133190eb1b22913bc9.tar.bz2 linux-stable-173bfa2782fa5ca3678e72133190eb1b22913bc9.zip | |
ipv6: Check attribute length for RTA_GATEWAY in multipath route
commit 4619bcf91399f00a40885100fb61d594d8454033 upstream.
Commit referenced in the Fixes tag used nla_memcpy for RTA_GATEWAY as
does the current nla_get_in6_addr. nla_memcpy protects against accessing
memory greater than what is in the attribute, but there is no check
requiring the attribute to have an IPv6 address. Add it.
Fixes: 51ebd3181572 ("ipv6: add support of equal cost multipath (ECMP)")
Signed-off-by: David Ahern <dsahern@kernel.org>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6fef0d7586bf..536cbc78ddbc 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5113,6 +5113,19 @@ out: return should_notify; } +static int fib6_gw_from_attr(struct in6_addr *gw, struct nlattr *nla, + struct netlink_ext_ack *extack) +{ + if (nla_len(nla) < sizeof(*gw)) { + NL_SET_ERR_MSG(extack, "Invalid IPv6 address in RTA_GATEWAY"); + return -EINVAL; + } + + *gw = nla_get_in6_addr(nla); + + return 0; +} + static int ip6_route_multipath_add(struct fib6_config *cfg, struct netlink_ext_ack *extack) { @@ -5153,7 +5166,13 @@ static int ip6_route_multipath_add(struct fib6_config *cfg, nla = nla_find(attrs, attrlen, RTA_GATEWAY); if (nla) { - r_cfg.fc_gateway = nla_get_in6_addr(nla); + int ret; + + ret = fib6_gw_from_attr(&r_cfg.fc_gateway, nla, + extack); + if (ret) + return ret; + r_cfg.fc_flags |= RTF_GATEWAY; } r_cfg.fc_encap = nla_find(attrs, attrlen, RTA_ENCAP); |