aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hasko <hasko.stevo@gmail.com>2012-12-21 15:04:59 +0000
committerWilly Tarreau <w@1wt.eu>2013-06-10 11:43:28 +0200
commit6e9a4199eb6df7a4444cf3a18dbfba51a021e4bb (patch)
tree150766b4b6b3a0d6f2384e7af60f89418b811219
parent0b42ca0de11329f2e7330273d6b029a426a5dc17 (diff)
net: sched: integer overflow fix
[ Upstream commit d2fe85da52e89b8012ffad010ef352a964725d5f ] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--net/sched/sch_htb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 85acab9dc6fd..2f074d66377f 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -865,7 +865,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 */