From: Greg KH <gregkh@suse•de>
To: linux-kernel@vger•kernel.org, stable@kernel•org
Cc: Justin Forbes <jmforbes@linuxtx•org>,
Zwane Mwaikambo <zwane@arm•linux.org.uk>,
Theodore Ts'o <tytso@mit•edu>,
Randy Dunlap <rdunlap@xenotime•net>,
Dave Jones <davej@redhat•com>,
Chuck Wolber <chuckw@quantumlinux•com>,
Chris Wedgwood <reviews@ml•cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv•org>,
Chuck Ebbert <cebbert@redhat•com>,
Domenico Andreoli <cavokz@gmail•com>, Willy Tarreau <w@1wt•eu>,
Rodrigo Rubira Branco <rbranco@la•checkpoint.com>,
Jake Edge <jake@lwn•net>, Eugene Teo <eteo@redhat•com>,
torvalds@linux-foundation•org, akpm@linux-foundation•org,
alan@lxorguk•ukuu.org.uk, netdev@vger•kernel.org,
netfilter-devel@vger•kernel.org,
Patrick McHardy <kaber@trash•net>,
davem@davemloft•net
Subject: [patch 30/46] netfilter: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian
Date: Thu, 22 Jan 2009 17:12:35 -0800 [thread overview]
Message-ID: <20090123011235.GE19756@kroah.com> (raw)
In-Reply-To: <20090123011110.GA19756@kroah.com>
[-- Attachment #1: netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch --]
[-- Type: text/plain, Size: 1693 bytes --]
2.6.28-stable review patch. If anyone has any objections, please let us know.
------------------
From: Patrick McHardy <kaber@trash•net>
Upstream commit 71320af:
An old bug crept back into the ICMP/ICMPv6 conntrack protocols: the timeout
values are defined as unsigned longs, the sysctl's maxsize is set to
sizeof(unsigned int). Use unsigned int for the timeout values as in the
other conntrack protocols.
Reported-by: Jean-Mickael Guerin <jean-mickael.guerin@6wind•com>
Signed-off-by: Patrick McHardy <kaber@trash•net>
Signed-off-by: David S. Miller <davem@davemloft•net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse•de>
---
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +-
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -20,7 +20,7 @@
#include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/nf_log.h>
-static unsigned long nf_ct_icmp_timeout __read_mostly = 30*HZ;
+static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ;
static bool icmp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
struct nf_conntrack_tuple *tuple)
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -26,7 +26,7 @@
#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h>
#include <net/netfilter/nf_log.h>
-static unsigned long nf_ct_icmpv6_timeout __read_mostly = 30*HZ;
+static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ;
static bool icmpv6_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff,
prev parent reply other threads:[~2009-01-23 1:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090123010651.683741823@mini.kroah.org>
[not found] ` <20090123011110.GA19756@kroah.com>
2009-01-23 1:12 ` [patch 28/46] netfilter: x_tables: fix match/target revision lookup Greg KH
2009-01-23 1:12 ` [patch 29/46] netfilter: ebtables: fix inversion in match code Greg KH
2009-01-23 1:12 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090123011235.GE19756@kroah.com \
--to=gregkh@suse$(echo .)de \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=cavokz@gmail$(echo .)com \
--cc=cebbert@redhat$(echo .)com \
--cc=chuckw@quantumlinux$(echo .)com \
--cc=davej@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eteo@redhat$(echo .)com \
--cc=jake@lwn$(echo .)net \
--cc=jmforbes@linuxtx$(echo .)org \
--cc=kaber@trash$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mkrufky@linuxtv$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=rbranco@la$(echo .)checkpoint.com \
--cc=rdunlap@xenotime$(echo .)net \
--cc=reviews@ml$(echo .)cw.f00f.org \
--cc=stable@kernel$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=tytso@mit$(echo .)edu \
--cc=w@1wt$(echo .)eu \
--cc=zwane@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox