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

Commit f9caed59 authored by Joe Perches's avatar Joe Perches Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_ct_helper: Fix logging for dropped packets 



Update nf_ct_helper_log to emit args along with the format.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 114a6f8b

net/netfilter/nf_conntrack_helper.c

+10 −1
Original line number Diff line number Diff line
@@ -341,6 +341,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);
@@ -349,7 +356,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);