diff options
| author | David Ahern <dsahern@kernel.org> | 2022-03-14 09:57:34 +0800 |
|---|---|---|
| committer | Yongqiang Liu <liuyongqiang13@huawei.com> | 2022-03-14 16:01:28 +0800 |
| commit | a47f1baa8bd5a49748944bd08fd847d142c1027c (patch) | |
| tree | 0432d4b29438714e280f01c9a629920cd971bfa4 | |
| parent | 172a65e3fc7185ccfea45929dcb537caae1cef34 (diff) | |
| download | openEuler-kernel-a47f1baa8bd5a49748944bd08fd847d142c1027c.tar.gz | |
ipv6: Check attribute length for RTA_GATEWAY in multipath route
stable inclusion
from linux-4.19.225
commit 44c90b4e6bcbb10f4066b91e8da9c58d4609768c
--------------------------------
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>
Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
Signed-off-by: Laibin Qiu <qiulaibin@huawei.com>
Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
| -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 01f8e62302fabf..a680498b11784e 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4424,6 +4424,19 @@ static void ip6_route_mpath_notify(struct fib6_info *rt, inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags); } +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) { @@ -4464,7 +4477,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); |