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>
This commit is contained in:
Joe Perches 2013-02-18 21:51:07 +00:00 коммит произвёл Pablo Neira Ayuso
Родитель 114a6f8b52
Коммит f9caed59f8
1 изменённых файлов: 10 добавлений и 1 удалений

Просмотреть файл

@ -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_conn_help *help;
const struct nf_conntrack_helper *helper; 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 */ /* Called from the helper function, this call never fails */
help = nfct_help(ct); 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); helper = rcu_dereference(help->helper);
nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, 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); EXPORT_SYMBOL_GPL(nf_ct_helper_log);