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

Commit 78582416 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents ec0506db 768b1031

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -4404,7 +4404,8 @@ L: netfilter@vger.kernel.org 
L:	coreteam@netfilter.org

W:	http://www.netfilter.org/

W:	http://www.iptables.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git

S:	Supported

F:	include/linux/netfilter*

F:	include/linux/netfilter/

net/bridge/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


menuconfig BRIDGE_NF_EBTABLES

	tristate "Ethernet Bridge tables (ebtables) support"

	depends on BRIDGE && BRIDGE_NETFILTER

	depends on BRIDGE && NETFILTER

	select NETFILTER_XTABLES

	help

	  ebtables is a general, extensible frame/packet identification

net/ipv4/netfilter/ip_queue.c

+5 −7
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) 
	return skb;



nlmsg_failure:

	kfree_skb(skb);

	*errp = -EINVAL;

	printk(KERN_ERR "ip_queue: error creating packet message\n");

	return NULL;
@@ -313,7 +314,7 @@ ipq_set_verdict(struct ipq_verdict_msg *vmsg, unsigned int len) 
{

	struct nf_queue_entry *entry;



	if (vmsg->value > NF_MAX_VERDICT)

	if (vmsg->value > NF_MAX_VERDICT || vmsg->value == NF_STOLEN)

		return -EINVAL;



	entry = ipq_find_dequeue_entry(vmsg->id);
@@ -358,9 +359,6 @@ ipq_receive_peer(struct ipq_peer_msg *pmsg, 
		break;



	case IPQM_VERDICT:

		if (pmsg->msg.verdict.value > NF_MAX_VERDICT)

			status = -EINVAL;

		else

		status = ipq_set_verdict(&pmsg->msg.verdict,

					 len - sizeof(*pmsg));

		break;

net/ipv6/netfilter/ip6_queue.c

+5 −7
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) 
	return skb;



nlmsg_failure:

	kfree_skb(skb);

	*errp = -EINVAL;

	printk(KERN_ERR "ip6_queue: error creating packet message\n");

	return NULL;
@@ -313,7 +314,7 @@ ipq_set_verdict(struct ipq_verdict_msg *vmsg, unsigned int len) 
{

	struct nf_queue_entry *entry;



	if (vmsg->value > NF_MAX_VERDICT)

	if (vmsg->value > NF_MAX_VERDICT || vmsg->value == NF_STOLEN)

		return -EINVAL;



	entry = ipq_find_dequeue_entry(vmsg->id);
@@ -358,9 +359,6 @@ ipq_receive_peer(struct ipq_peer_msg *pmsg, 
		break;



	case IPQM_VERDICT:

		if (pmsg->msg.verdict.value > NF_MAX_VERDICT)

			status = -EINVAL;

		else

		status = ipq_set_verdict(&pmsg->msg.verdict,

					 len - sizeof(*pmsg));

		break;

net/netfilter/nf_conntrack_pptp.c

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ pptp_inbound_pkt(struct sk_buff *skb, 
		break;



	case PPTP_WAN_ERROR_NOTIFY:

	case PPTP_SET_LINK_INFO:

	case PPTP_ECHO_REQUEST:

	case PPTP_ECHO_REPLY:

		/* I don't have to explain these ;) */