Skip to contentSkip to conversation

: Netfilter fixes for 2.6.17

PATCH In review Patrick McHardy 2 participants 5 messages May 28, 2006 – May 29, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover : Netfilter fixes for 2.6.17

Hi Dave,

following are a two more fixes for 2.6.17 and a patch to mark the H.323 helper experimental. Please apply.

 net/ipv4/netfilter/Kconfig                     |    4 ++--
 net/ipv4/netfilter/ip_conntrack_core.c         |    1 +
 net/ipv4/netfilter/ip_conntrack_helper_pptp.c  |    4 ++--
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

Alexey Dobriyan:
[NETFILTER]: PPTP helper: fix sstate/cstate typo

Marcel Holtmann:
[NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)

Patrick McHardy:
[NETFILTER]: mark H.323 helper experimental

#1 lore raw

PATCH 1/3 : Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)

[NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)

It appears that sockaddr_in.sin_zero is not zeroed during getsockopt(...SO_ORIGINAL_DST...) operation. This can lead to an information leak (CVE-2006-1343).

---
commit 31ce0405d43d58f359431362ef676735d8ccc7eb
tree fac8f79c318f37d4cb6795e540b77be61c9d1f5d
parent 705af309505681f197f81618440954d10f120dc0
author Marcel Holtmann <[email protected]> Fri, 26 May 2006 16:34:34 +0200 committer Patrick McHardy <[email protected]> Fri, 26 May 2006 16:34:34 +0200

 net/ipv4/netfilter/ip_conntrack_core.c         |    1 +
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
net/ipv4/netfilter/ip_conntrack_core.c +1 -0
index 979a2ea..a297da7 100644
@@ -1318,6 +1318,7 @@ getorigdst(struct sock *sk, int optval, 
 			.tuple.dst.u.tcp.port;
 		sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
 			.tuple.dst.ip;
+		memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
 
 		DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
 		       NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +1 -0
index 5bc9f64..77d9744 100644
@@ -348,6 +348,7 @@ getorigdst(struct sock *sk, int optval, 
 			.tuple.dst.u.tcp.port;
 		sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
 			.tuple.dst.u3.ip;
+		memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
 
 		DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
 		       NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
#2 lore raw

PATCH 2/3 : mark H.323 helper experimental

In reply to Patrick McHardy

[NETFILTER]: mark H.323 helper experimental

---
commit b82323a2dfb5b58b9ca3e3687b35bae0ac90b503
tree 742877c3cd6c1d70e944079cc5638e58c8e84443
parent 31ce0405d43d58f359431362ef676735d8ccc7eb
author Patrick McHardy <[email protected]> Sun, 28 May 2006 17:18:34 +0200 committer Patrick McHardy <[email protected]> Sun, 28 May 2006 17:18:34 +0200

 net/ipv4/netfilter/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/Kconfig +2 -2
index 3d560de..d407253 100644
@@ -170,8 +170,8 @@ config IP_NF_PPTP
 	  Documentation/modules.txt.  If unsure, say `N'.
 
 config IP_NF_H323
-	tristate  'H.323 protocol support'
-	depends on IP_NF_CONNTRACK
+	tristate  'H.323 protocol support (EXPERIMENTAL)'
+	depends on IP_NF_CONNTRACK && EXPERIMENTAL
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
 	  important VoIP protocols, it is widely used by voice hardware and
#3 lore raw

PATCH 3/3 : PPTP helper: fix sstate/cstate typo

In reply to Patrick McHardy

[NETFILTER]: PPTP helper: fix sstate/cstate typo

---
commit f80ffe2d3c9364404f4545196c70784c70fa8d28
tree 70a63104f71218daca622539cb73b5872fb0f0be
parent b82323a2dfb5b58b9ca3e3687b35bae0ac90b503
author Alexey Dobriyan <[email protected]> Mon, 29 May 2006 00:47:57 +0200 committer Patrick McHardy <[email protected]> Mon, 29 May 2006 00:47:57 +0200

 net/ipv4/netfilter/ip_conntrack_helper_pptp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_conntrack_helper_pptp.c +2 -2
index 7d3ba43..8ccfe17 100644
@@ -469,8 +469,8 @@ pptp_inbound_pkt(struct sk_buff **pskb,
 			DEBUGP("%s but no session\n", pptp_msg_name[msg]);
 			break;
 		}
-		if (info->sstate != PPTP_CALL_IN_REP
-		    && info->sstate != PPTP_CALL_IN_CONF) {
+		if (info->cstate != PPTP_CALL_IN_REP
+		    && info->cstate != PPTP_CALL_IN_CONF) {
 			DEBUGP("%s but never sent IN_CALL_REPLY\n",
 				pptp_msg_name[msg]);
 			break;
maintainer
#4 lore raw
In reply to Patrick McHardy

From: Patrick McHardy <[email protected]>
Date: Mon, 29 May 2006 01:06:30 +0200 (MEST)

Quoted 2 lines

following are a two more fixes for 2.6.17 and a patch to mark the H.323 helper experimental. Please apply.

Applied and push to Linus, thanks a lot Patrick.