net_sched: fix datalen for ematch
Subsystems (3)
PATCH 1/1 net_sched: fix datalen for ematch
syzbot reported an out-of-bound access in em_nbyte. As initially analyzed by Eric, this is because em_nbyte sets its own em->datalen in em_nbyte_change() other than the one specified by user, but this value gets overwritten later by its caller tcf_em_validate(). We should leave em->datalen untouched to respect their choices.
I audit all the in-tree ematch users, all of those implement ->change() set em->datalen, so we can just avoid setting it twice in this case.
--- net/sched/ematch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/ematch.c +1 -1
@@ -263,12 +263,12 @@ static int tcf_em_validate(struct tcf_proto *tp, } em->data = (unsigned long ) v; } + em->datalen = data_len; } } em->matchid = em_hdr->matchid; em->flags = em_hdr->flags; - em->datalen = data_len; em->net = net; err =0 ;
Signature · 1 line
2.21.1
Quoted 10 lines · Cong Wang
syzbot reported an out-of-bound access in
em_nbyte. As initially analyzed by Eric, this is becauseem_nbytesets its ownem->dataleninem_nbyte_change()other than the one specified by user, but this value gets overwritten later by its callertcf_em_validate(). We should leaveem->datalenuntouched to respect their choices.I audit all the in-tree ematch users, all of those implement ->change() set
em->datalen, so we can just avoid setting it twice in this case.
Quoted 7 lines
Reported-and-tested-by [email protected]Reported-by [email protected]Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Cc Eric Dumazet <[email protected]>Signed-off-by Cong Wang <[email protected]>---
SGTM, thanks.
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Wed, 22 Jan 2020 15:42:02 -0800
Quoted 10 lines
syzbot reported an out-of-bound access in
em_nbyte. As initially analyzed by Eric, this is becauseem_nbytesets its ownem->dataleninem_nbyte_change()other than the one specified by user, but this value gets overwritten later by its callertcf_em_validate(). We should leaveem->datalenuntouched to respect their choices.I audit all the in-tree ematch users, all of those implement ->change() set
em->datalen, so we can just avoid setting it twice in this case.
Quoted 5 lines
Reported-and-tested-by [email protected]Reported-by [email protected]Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Cc Eric Dumazet <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied and queued up for -stable, thanks.