Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a02d2be7 authored by David Ahern's avatar David Ahern Committed by Greg Kroah-Hartman
Browse files

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: 51ebd318 ("ipv6: add support of equal cost multipath (ECMP)")
Signed-off-by: default avatarDavid Ahern <dsahern@kernel.org>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34224e93

net/ipv6/route.c

+20 −1
Original line number Diff line number Diff line
@@ -5092,6 +5092,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)

{
@@ -5133,7 +5146,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);