diff options
| author | Joe Perches <joe@perches.com> | 2013-02-18 21:51:07 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-03-02 22:44:45 +0100 |
| commit | f9caed59f801f77a2844ab04d2dea8df33ac862b (patch) | |
| tree | ac8f191a9df83cd7911a6434634d989f9eb77210 | |
| parent | 114a6f8b52163c0232fbcd7f3808ff04dc61a9b5 (diff) | |
| download | linux-f9caed59f801f77a2844ab04d2dea8df33ac862b.tar.gz linux-f9caed59f801f77a2844ab04d2dea8df33ac862b.tar.bz2 linux-f9caed59f801f77a2844ab04d2dea8df33ac862b.zip | |
netfilter: nf_ct_helper: Fix logging for dropped packets
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>
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 013cdf69fe29..bb4188f170e3 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -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); |