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

Commit 214339f1 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

net: sched: Fix memory exposure from short TCA_U32_SEL 



[ Upstream commit 98c8f125fd8a6240ea343c1aa50a1be9047791b8 ]

Via u32_change(), TCA_U32_SEL has an unspecified type in the netlink
policy, so max length isn't enforced, only minimum. This means nkeys
(from userspace) was being trusted without checking the actual size of
nla_len(), which could lead to a memory over-read, and ultimately an
exposure via a call to u32_dump(). Reachability is CAP_NET_ADMIN within
a namespace.

Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89550ec5

net/sched/cls_u32.c

+6 −2
Original line number Diff line number Diff line
@@ -851,6 +851,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, 
	struct nlattr *opt = tca[TCA_OPTIONS];

	struct nlattr *tb[TCA_U32_MAX + 1];

	u32 htid, flags = 0;

	size_t sel_size;

	int err;

#ifdef CONFIG_CLS_U32_PERF

	size_t size;
@@ -967,8 +968,11 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, 
		return -EINVAL;



	s = nla_data(tb[TCA_U32_SEL]);

	sel_size = sizeof(*s) + sizeof(*s->keys) * s->nkeys;

	if (nla_len(tb[TCA_U32_SEL]) < sel_size)

		return -EINVAL;



	n = kzalloc(sizeof(*n) + s->nkeys*sizeof(struct tc_u32_key), GFP_KERNEL);

	n = kzalloc(offsetof(typeof(*n), sel) + sel_size, GFP_KERNEL);

	if (n == NULL)

		return -ENOBUFS;
@@ -981,7 +985,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, 
	}

#endif



	memcpy(&n->sel, s, sizeof(*s) + s->nkeys*sizeof(struct tc_u32_key));

	memcpy(&n->sel, s, sel_size);

	RCU_INIT_POINTER(n->ht_up, ht);

	n->handle = handle;

	n->fshift = s->hmask ? ffs(ntohl(s->hmask)) - 1 : 0;