Commit 0d1c3530 authored Mar 11, 2020 by Cong Wang Committed by David S. Miller Mar 14, 2020

net_sched: keep alloc_hash updated after hash allocation



In commit 599be01e ("net_sched: fix an OOB access in cls_tcindex")
I moved cp->hash calculation before the first
tcindex_alloc_perfect_hash(), but cp->alloc_hash is left untouched.
This difference could lead to another out of bound access.

cp->alloc_hash should always be the size allocated, we should
update it after this tcindex_alloc_perfect_hash().

Reported-and-tested-by:  <syzbot+dcc34d54d68ef7d2d53d@syzkaller.appspotmail.com>
Reported-and-tested-by:  <syzbot+c72da7b9ed57cde6fca2@syzkaller.appspotmail.com>
Fixes: 599be01e ("net_sched: fix an OOB access in cls_tcindex")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b1be2e8c

net/sched/cls_tcindex.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,7 @@ tcindex_set_parms(struct net net, struct tcf_proto tp, unsigned long base,

		if (tcindex_alloc_perfect_hash(net, cp) < 0)
		goto errout;
		cp->alloc_hash = cp->hash;
		for (i = 0; i < min(cp->hash, p->hash); i++)
		cp->perfect[i].res = p->perfect[i].res;
		balloc = 1;

Admin message