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

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

Merge branch 'master' of git://1984.lsi.us.es/nf 



Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter fixes for your net tree,
they are:

* Don't generate audit log message if audit is not enabled, from Gao Feng.

* Fix logging formatting for packets dropped by helpers, by Joe Perches.

* Fix a compilation warning in nfnetlink if CONFIG_PROVE_RCU is not set,
  from Paul Bolle.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b4cd8a0 9df9e783

net/netfilter/nf_conntrack_helper.c

+10 −1
Original line number Diff line number Diff line
@@ -339,6 +339,13 @@ void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct, 
{

	const struct nf_conn_help *help;

	const struct nf_conntrack_helper *helper;

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	/* Called from the helper function, this call never fails */

	help = nfct_help(ct);
@@ -347,7 +354,9 @@ void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct, 
	helper = rcu_dereference(help->helper);



	nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL,

		      "nf_ct_%s: dropping packet: %s ", helper->name, fmt);

		      "nf_ct_%s: dropping packet: %pV ", helper->name, &vaf);



	va_end(args);

}

EXPORT_SYMBOL_GPL(nf_ct_helper_log);

net/netfilter/nfnetlink.c

+1 −6
Original line number Diff line number Diff line
@@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id) 
}

EXPORT_SYMBOL_GPL(nfnl_unlock);



static struct mutex *nfnl_get_lock(__u8 subsys_id)

{

	return &table[subsys_id].mutex;

}



int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)

{

	nfnl_lock(n->subsys_id);
@@ -199,7 +194,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
			rcu_read_unlock();

			nfnl_lock(subsys_id);

			if (rcu_dereference_protected(table[subsys_id].subsys,

				lockdep_is_held(nfnl_get_lock(subsys_id))) != ss ||

				lockdep_is_held(&table[subsys_id].mutex)) != ss ||

			    nfnetlink_find_client(type, ss) != nc)

				err = -EAGAIN;

			else if (nc->call)

net/netfilter/xt_AUDIT.c

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	const struct xt_audit_info *info = par->targinfo;

	struct audit_buffer *ab;



	if (audit_enabled == 0)

		goto errout;



	ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);

	if (ab == NULL)

		goto errout;