]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: sched: integer overflow fix
authorStefan Hasko <hasko.stevo@gmail.com>
Fri, 21 Dec 2012 15:04:59 +0000 (15:04 +0000)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 10 Feb 2014 21:10:54 +0000 (16:10 -0500)
commit d2fe85da52e89b8012ffad010ef352a964725d5f upstream.

Fixed integer overflow in function htb_dequeue

Signed-off-by: Stefan Hasko <hasko.stevo@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
net/sched/sch_htb.c

index 0b52b8de562c40db1bd4541a08389885af621cb2..efabd30425ec247a3c9431c9343772f68eb3c748 100644 (file)
@@ -866,7 +866,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
        q->now = psched_get_time();
        start_at = jiffies;
 
-       next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
+       next_event = q->now + 5LLU * PSCHED_TICKS_PER_SEC;
 
        for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
                /* common case optimization - skip event handler quickly */