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

Commit e2956fc8 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy 




[ Upstream commit aa8f8778493c85fff480cdf8b349b1e1dcb5f243 ]

KMSAN reported use of uninit-value that I tracked to lack
of proper size check on RTA_TABLE attribute.

I also believe RTA_PREFSRC lacks a similar check.

Fixes: 86872cb5 ("[IPv6] route: FIB6 configuration using struct fib6_config")
Fixes: c3968a85 ("ipv6: RTA_PREFSRC support for ipv6 route source address selection")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55ca7b1d

net/ipv6/route.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2811,6 +2811,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu) 




static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {

static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {

	[RTA_GATEWAY]           = { .len = sizeof(struct in6_addr) },

	[RTA_GATEWAY]           = { .len = sizeof(struct in6_addr) },

	[RTA_PREFSRC]		= { .len = sizeof(struct in6_addr) },

	[RTA_OIF]               = { .type = NLA_U32 },

	[RTA_OIF]               = { .type = NLA_U32 },

	[RTA_IIF]		= { .type = NLA_U32 },

	[RTA_IIF]		= { .type = NLA_U32 },

	[RTA_PRIORITY]          = { .type = NLA_U32 },

	[RTA_PRIORITY]          = { .type = NLA_U32 },
@@ -2820,6 +2821,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = { 
	[RTA_ENCAP_TYPE]	= { .type = NLA_U16 },

	[RTA_ENCAP_TYPE]	= { .type = NLA_U16 },

	[RTA_ENCAP]		= { .type = NLA_NESTED },

	[RTA_ENCAP]		= { .type = NLA_NESTED },

	[RTA_EXPIRES]		= { .type = NLA_U32 },

	[RTA_EXPIRES]		= { .type = NLA_U32 },

	[RTA_TABLE]		= { .type = NLA_U32 },

};

};





static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,

static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,