From patchwork Sat Dec 22 01:04:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hasko X-Patchwork-Id: 207904 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B3B4D2C0084 for ; Sat, 22 Dec 2012 12:05:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866Ab2LVBFU (ORCPT ); Fri, 21 Dec 2012 20:05:20 -0500 Received: from mail-ea0-f176.google.com ([209.85.215.176]:39880 "EHLO mail-ea0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119Ab2LVBFR (ORCPT ); Fri, 21 Dec 2012 20:05:17 -0500 X-Greylist: delayed 15838 seconds by postgrey-1.27 at vger.kernel.org; Fri, 21 Dec 2012 20:05:17 EST Received: by mail-ea0-f176.google.com with SMTP id d13so2188469eaa.21 for ; Fri, 21 Dec 2012 17:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=X0o7NoUJoGrGR50GZd8j39aSELWByP76TNASWXCMysg=; b=jl8RoAumGiAUA+diq71PWGR4BBvUX95D2kQqqsK16TvhdQ3Qd2p0HQx4k/bLpBxxyW gAPckJdj38LGgi8DuIX8AmvRGZW9ROo6U31rFNRMvh5ScqNGJ1hTF1qvPgTuA0c6gpl+ A+zL8InljmGj/f9NucOFXuoWRsQ85HIdJDVczCb49oY9VHIhlQPdK/qVHGO6zy6j4ztA HYMqiwl21iZxaUxT39IvaVkejf9RzdRQuYCJfgNhRO6+cMhuLQ1+qpw+Kpz2gqApeWqO VMRCsqax3Q8re2bxF0CTXaDQ5BIlS+RsURIjoAKKsB1iehWqkgB02eMGb+i4Cs9I/xii WlLQ== X-Received: by 10.14.221.5 with SMTP id q5mr36067231eep.33.1356138315761; Fri, 21 Dec 2012 17:05:15 -0800 (PST) Received: from localhost.localdomain (nat-88-212-40-170.antik.sk. [88.212.40.170]) by mx.google.com with ESMTPS id b49sm24873512eem.16.2012.12.21.17.05.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 17:05:14 -0800 (PST) From: Stefan Hasko To: Jamal Hadi Salim , "David S. Miller" , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Stefan Hasko Subject: [PATCH] net: sched: integer overflow fix Date: Sat, 22 Dec 2012 02:04:59 +0100 Message-Id: <1356138300-16076-1-git-send-email-hasko.stevo@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Eric Dumazet --- 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 */