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

Commit 5c4b2749 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/pablo/nf 



Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes and update
for the MAINTAINER file for your net tree, they are:

* Fix crash if nf_log_packet is called from conntrack, in that case
  both interfaces are NULL, from Hans Schillstrom. This bug introduced
  with the logging netns support in the previous merge window.

* Fix compilation of nf_log and nf_queue without CONFIG_PROC_FS,
  from myself. This bug was introduced in the previous merge window
  with the new netns support for the netfilter logging infrastructure.

* Fix possible crash in xt_TCPOPTSTRIP due to missing sanity
  checkings to validate that the TCP header is well-formed, from
  myself. I can find this bug in 2.6.25, probably it's been there
  since the beginning. I'll pass this to -stable.

* Update MAINTAINER file to point to new nf trees at git.kernel.org,
  remove Harald and use M: instead of P: (now obsolete tag) to
  keep Jozsef in the list of people.

Please, consider pulling this. Thanks!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 755ccb9d bc6bcb59

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -5509,18 +5509,18 @@ F: Documentation/networking/s2io.txt 
F:	Documentation/networking/vxge.txt

F:	drivers/net/ethernet/neterion/



NETFILTER/IPTABLES/IPCHAINS

P:	Harald Welte

P:	Jozsef Kadlecsik

NETFILTER/IPTABLES

M:	Pablo Neira Ayuso <pablo@netfilter.org>

M:	Patrick McHardy <kaber@trash.net>

M:	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

L:	netfilter-devel@vger.kernel.org

L:	netfilter@vger.kernel.org

L:	coreteam@netfilter.org

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

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

T:	git git://1984.lsi.us.es/nf

T:	git git://1984.lsi.us.es/nf-next

Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

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

S:	Supported

F:	include/linux/netfilter*

F:	include/linux/netfilter/

include/net/netfilter/nf_log.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ struct nf_loginfo { 
	} u;

};



typedef void nf_logfn(u_int8_t pf,

typedef void nf_logfn(struct net *net,

		      u_int8_t pf,

		      unsigned int hooknum,

		      const struct sk_buff *skb,

		      const struct net_device *in,

include/net/netfilter/nfnetlink_log.h

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
#define _KER_NFNETLINK_LOG_H



void

nfulnl_log_packet(u_int8_t pf,

nfulnl_log_packet(struct net *net,

		  u_int8_t pf,

		  unsigned int hooknum,

		  const struct sk_buff *skb,

		  const struct net_device *in,

net/bridge/netfilter/ebt_log.c

+5 −6
Original line number Diff line number Diff line
@@ -72,13 +72,12 @@ print_ports(const struct sk_buff *skb, uint8_t protocol, int offset) 
}



static void

ebt_log_packet(u_int8_t pf, unsigned int hooknum,

ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum,

	       const struct sk_buff *skb, const struct net_device *in,

	       const struct net_device *out, const struct nf_loginfo *loginfo,

	       const char *prefix)

{

	unsigned int bitmask;

	struct net *net = dev_net(in ? in : out);



	/* FIXME: Disabled from containers until syslog ns is supported */

	if (!net_eq(net, &init_net))
@@ -191,7 +190,7 @@ ebt_log_tg(struct sk_buff *skb, const struct xt_action_param *par) 
		nf_log_packet(net, NFPROTO_BRIDGE, par->hooknum, skb,

			      par->in, par->out, &li, "%s", info->prefix);

	else

		ebt_log_packet(NFPROTO_BRIDGE, par->hooknum, skb, par->in,

		ebt_log_packet(net, NFPROTO_BRIDGE, par->hooknum, skb, par->in,

			       par->out, &li, info->prefix);

	return EBT_CONTINUE;

}

net/bridge/netfilter/ebt_ulog.c

+11 −7
Original line number Diff line number Diff line
@@ -131,14 +131,16 @@ static struct sk_buff *ulog_alloc_skb(unsigned int size) 
	return skb;

}



static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,

   const struct net_device *in, const struct net_device *out,

   const struct ebt_ulog_info *uloginfo, const char *prefix)

static void ebt_ulog_packet(struct net *net, unsigned int hooknr,

			    const struct sk_buff *skb,

			    const struct net_device *in,

			    const struct net_device *out,

			    const struct ebt_ulog_info *uloginfo,

			    const char *prefix)

{

	ebt_ulog_packet_msg_t *pm;

	size_t size, copy_len;

	struct nlmsghdr *nlh;

	struct net *net = dev_net(in ? in : out);

	struct ebt_ulog_net *ebt = ebt_ulog_pernet(net);

	unsigned int group = uloginfo->nlgroup;

	ebt_ulog_buff_t *ub = &ebt->ulog_buffers[group];
@@ -233,7 +235,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, 
}



/* this function is registered with the netfilter core */

static void ebt_log_packet(u_int8_t pf, unsigned int hooknum,

static void ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum,

   const struct sk_buff *skb, const struct net_device *in,

   const struct net_device *out, const struct nf_loginfo *li,

   const char *prefix)
@@ -252,13 +254,15 @@ static void ebt_log_packet(u_int8_t pf, unsigned int hooknum, 
		strlcpy(loginfo.prefix, prefix, sizeof(loginfo.prefix));

	}



	ebt_ulog_packet(hooknum, skb, in, out, &loginfo, prefix);

	ebt_ulog_packet(net, hooknum, skb, in, out, &loginfo, prefix);

}



static unsigned int

ebt_ulog_tg(struct sk_buff *skb, const struct xt_action_param *par)

{

	ebt_ulog_packet(par->hooknum, skb, par->in, par->out,

	struct net *net = dev_net(par->in ? par->in : par->out);



	ebt_ulog_packet(net, par->hooknum, skb, par->in, par->out,

	                par->targinfo, NULL);

	return EBT_CONTINUE;

}