Skip to content

Commit

Permalink
netfilter: nf_ct_helper: Fix logging for dropped packets
Browse files Browse the repository at this point in the history
Update nf_ct_helper_log to emit args along with the format.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Joe Perches authored and Pablo Neira Ayuso committed Mar 2, 2013
1 parent 114a6f8 commit f9caed5
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion net/netfilter/nf_conntrack_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down

0 comments on commit f9caed5

Please sign in to comment.