public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chris Wright <chrisw@osdl.org>
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>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
	Patrick McHardy <kaber@trash.net>,
	"David S. Miller" <davem@davemloft.net>
Subject: [07/13] [NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)
Date: Tue, 2 Aug 2005 23:57:33 -0700	[thread overview]
Message-ID: <20050803065733.GV7762@shell0.pdx.osdl.net> (raw)
In-Reply-To: <20050803064439.GO7762@shell0.pdx.osdl.net>

-stable review patch.  If anyone has any objections, please let us know.

------------------

[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)

The portptr pointing to the port in the conntrack tuple is declared static,
which could result in memory corruption when two packets of the same
protocol are NATed at the same time and one conntrack goes away.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 net/ipv4/netfilter/ip_nat_proto_tcp.c |    3 ++-
 net/ipv4/netfilter/ip_nat_proto_udp.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- linux-2.6.12.3.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c	2005-07-28 11:17:01.000000000 -0700
+++ linux-2.6.12.3/net/ipv4/netfilter/ip_nat_proto_tcp.c	2005-07-28 11:17:15.000000000 -0700
@@ -40,7 +40,8 @@
 		 enum ip_nat_manip_type maniptype,
 		 const struct ip_conntrack *conntrack)
 {
-	static u_int16_t port, *portptr;
+	static u_int16_t port;
+	u_int16_t *portptr;
 	unsigned int range_size, min, i;
 
 	if (maniptype == IP_NAT_MANIP_SRC)
--- linux-2.6.12.3.orig/net/ipv4/netfilter/ip_nat_proto_udp.c	2005-07-28 11:17:01.000000000 -0700
+++ linux-2.6.12.3/net/ipv4/netfilter/ip_nat_proto_udp.c	2005-07-28 11:17:15.000000000 -0700
@@ -41,7 +41,8 @@
 		 enum ip_nat_manip_type maniptype,
 		 const struct ip_conntrack *conntrack)
 {
-	static u_int16_t port, *portptr;
+	static u_int16_t port;
+	u_int16_t *portptr;
 	unsigned int range_size, min, i;
 
 	if (maniptype == IP_NAT_MANIP_SRC)

  parent reply	other threads:[~2005-08-03  7:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-08-03  6:44 [00/13] -stable review Chris Wright
2005-08-03  6:47 ` [01/13] kbuild: build TAGS problem with O= Chris Wright
2005-08-03 17:37   ` Sam Ravnborg
2005-08-03  6:48 ` [02/13] qla2xxx: Correct handling of fc_remote_port_add() failure case Chris Wright
2005-08-03  6:50 ` [03/13] rocket.c: Fix ldisc ref count handling Chris Wright
2005-08-03  6:52 ` [04/13] x86_64 memleak from malicious 32bit elf program Chris Wright
2005-08-03  8:46   ` Andi Kleen
2005-08-03  6:53 ` [05/13] [NET]: Fix signedness issues in net/core/filter.c Chris Wright
2005-08-03  6:55 ` [06/13] [NETFILTER]: Fix deadlock in ip6_queue Chris Wright
2005-08-03  6:57 ` Chris Wright [this message]
2005-08-03  6:59 ` [08/13] [NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload Chris Wright
2005-08-03  7:01 ` [09/13] [XFRM]: Fix possible overflow of sock->sk_policy Chris Wright
2005-08-03  7:03 ` [10/13] [PATCH] bio_clone fix Chris Wright
2005-08-03  7:13   ` Jens Axboe
2005-08-03  7:04 ` [11/13] sys_get_thread_area does not clear the returned argument Chris Wright
2005-08-03  7:06 ` [12/13] [VLAN]: Fix early vlan adding leads to not functional device Chris Wright
2005-08-03  7:07 ` [13/13] Fix powernow oops on dual-core athlon Chris Wright

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=20050803065733.GV7762@shell0.pdx.osdl.net \
    --to=chrisw@osdl.org \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chuckw@quantumlinux.com \
    --cc=davem@davemloft.net \
    --cc=jmforbes@linuxtx.org \
    --cc=kaber@trash.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --cc=stable@kernel.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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