From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765792AbYHDVia (ORCPT ); Mon, 4 Aug 2008 17:38:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765590AbYHDVgp (ORCPT ); Mon, 4 Aug 2008 17:36:45 -0400 Received: from mx1.suse.de ([195.135.220.2]:54710 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765222AbYHDVgo (ORCPT ); Mon, 4 Aug 2008 17:36:44 -0400 Date: Mon, 4 Aug 2008 14:30:16 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, David Howells Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "David S.Miller" , Patrick McHardy , Oliver Pinter Subject: [patch 09/25] netfilter: xt_time: fix times time_mt()s use of do_div() Message-ID: <20080804213016.GI8014@suse.de> References: <20080804203506.816201392@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="netfilter-xt_time-fix-time-s-time_mt-s-use-of-do_div.patch" In-Reply-To: <20080804212725.GA7944@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.26-stable review patch. If anyone has any objections, please let us know. ------------------ From: David Howells [ Upstream commit 280763c053fee297d95b474f2c145990670371e6 ] Fix netfilter xt_time's time_mt()'s use of do_div() on an s64 by using div_s64() instead. This was introduced by patch ee4411a1b1e0b679c99686629b5eab5a072ce49f ("[NETFILTER]: x_tables: add xt_time match"). Signed-off-by: David Howells Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller CC: Oliver Pinter Signed-off-by: Greg Kroah-Hartman --- net/netfilter/xt_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c @@ -173,7 +173,7 @@ time_mt(const struct sk_buff *skb, const __net_timestamp((struct sk_buff *)skb); stamp = ktime_to_ns(skb->tstamp); - do_div(stamp, NSEC_PER_SEC); + stamp = div_s64(stamp, NSEC_PER_SEC); if (info->flags & XT_TIME_LOCAL_TZ) /* Adjust for local timezone */ --