| Message ID | 1356138300-16076-1-git-send-email-hasko.stevo@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 2012-12-22 at 02:04 +0100, Stefan Hasko wrote: > Sorry, I did not realize different sizes casting problem, now it's clear to me. Thanks for help. > > Fixed integer overflow in function htb_dequeue > > Signed-off-by: Stefan Hasko <hasko.stevo@gmail.com> > --- > net/sched/sch_htb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c > index d2922c0..51561ea 100644 > --- a/net/sched/sch_htb.c > +++ b/net/sched/sch_htb.c > @@ -919,7 +919,7 @@ ok: > q->now = ktime_to_ns(ktime_get()); > start_at = jiffies; > > - next_event = q->now + 5 * NSEC_PER_SEC; > + next_event = q->now + 5LLU * NSEC_PER_SEC; > > for (level = 0; level < TC_HTB_MAXDEPTH; level++) { > /* common case optimization - skip event handler quickly */ I guess David will remove the first line of your changelog Acked-by: Eric Dumazet <edumazet@google.com> Thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Fri, 21 Dec 2012 17:16:37 -0800 > On Sat, 2012-12-22 at 02:04 +0100, Stefan Hasko wrote: >> Sorry, I did not realize different sizes casting problem, now it's clear to me. Thanks for help. >> >> Fixed integer overflow in function htb_dequeue >> >> Signed-off-by: Stefan Hasko <hasko.stevo@gmail.com> >> --- >> net/sched/sch_htb.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c >> index d2922c0..51561ea 100644 >> --- a/net/sched/sch_htb.c >> +++ b/net/sched/sch_htb.c >> @@ -919,7 +919,7 @@ ok: >> q->now = ktime_to_ns(ktime_get()); >> start_at = jiffies; >> >> - next_event = q->now + 5 * NSEC_PER_SEC; >> + next_event = q->now + 5LLU * NSEC_PER_SEC; >> >> for (level = 0; level < TC_HTB_MAXDEPTH; level++) { >> /* common case optimization - skip event handler quickly */ > > I guess David will remove the first line of your changelog > > Acked-by: Eric Dumazet <edumazet@google.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index d2922c0..51561ea 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -919,7 +919,7 @@ ok: q->now = ktime_to_ns(ktime_get()); start_at = jiffies; - next_event = q->now + 5 * NSEC_PER_SEC; + next_event = q->now + 5LLU * NSEC_PER_SEC; for (level = 0; level < TC_HTB_MAXDEPTH; level++) { /* common case optimization - skip event handler quickly */
Sorry, I did not realize different sizes casting problem, now it's clear to me. Thanks for help. Fixed integer overflow in function htb_dequeue Signed-off-by: Stefan Hasko <hasko.stevo@gmail.com> --- net/sched/sch_htb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)