]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sch_netem: fix a divide by zero in tabledist()
authorEric Dumazet <edumazet@google.com>
Wed, 18 Sep 2019 15:05:39 +0000 (08:05 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 10 Dec 2019 18:01:22 +0000 (18:01 +0000)
commit b41d936b5ecfdb3a4abc525ce6402a6c49cffddc upstream.

syzbot managed to crash the kernel in tabledist() loading
an empty distribution table.

t = dist->table[rnd % dist->size];

Simply return an error when such load is attempted.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/sched/sch_netem.c

index ab8263d97c5bab61caf85745ddf1c333322dbcdc..95df63bca9289ce40d176562a57e7061d06cb640 100644 (file)
@@ -737,7 +737,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr)
        int i;
        size_t s;
 
-       if (n > NETEM_DIST_MAX)
+       if (!n || n > NETEM_DIST_MAX)
                return -EINVAL;
 
        s = sizeof(struct disttable) + n * sizeof(s16);