Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b3f96b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: PPTP helper: fix sstate/cstate typo
  [NETFILTER]: mark H.323 helper experimental
  [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)
parents 47ce56ed 7114b0bb

net/ipv4/netfilter/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

net/ipv4/netfilter/ip_conntrack_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1318,6 +1318,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
			.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/ip_conntrack_helper_pptp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
			.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));