From patchwork Thu Mar 7 11:00:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 225806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF3462C039B for ; Thu, 7 Mar 2013 22:00:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756016Ab3CGLAT (ORCPT ); Thu, 7 Mar 2013 06:00:19 -0500 Received: from mail.us.es ([193.147.175.20]:41564 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755965Ab3CGLAP (ORCPT ); Thu, 7 Mar 2013 06:00:15 -0500 Received: (qmail 26301 invoked from network); 7 Mar 2013 12:00:14 +0100 Received: from unknown (HELO us.es) (192.168.2.13) by us.es with SMTP; 7 Mar 2013 12:00:14 +0100 Received: (qmail 16317 invoked by uid 507); 7 Mar 2013 11:00:14 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus3 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.6/16797. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-98.2/7.5):. Processed in 2.107173 secs); 07 Mar 2013 11:00:14 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus3 X-Spam-Level: X-Spam-Status: No, score=-98.2 required=7.5 tests=BAYES_50,HELO_LH_HOME, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus3) (127.0.0.1) by us.es with SMTP; 7 Mar 2013 11:00:12 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus3 (F-Secure/fsigk_smtp/407/antivirus3); Thu, 07 Mar 2013 12:00:12 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus3) Received: (qmail 6555 invoked from network); 7 Mar 2013 12:00:11 +0100 Received: from 1984.lsi.us.es (HELO soleta.lan) (pneira@us.es@150.214.188.80) by us.es with SMTP; 7 Mar 2013 12:00:11 +0100 From: pablo@netfilter.org To: netdev@vger.kernel.org Cc: davem@davemloft.net, netfilter-devel@vger.kernel.org Subject: [PATCH 1/3] netfilter: nf_ct_helper: Fix logging for dropped packets Date: Thu, 7 Mar 2013 12:00:00 +0100 Message-Id: <1362654002-4405-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362654002-4405-1-git-send-email-pablo@netfilter.org> References: <1362654002-4405-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Joe Perches Update nf_ct_helper_log to emit args along with the format. Signed-off-by: Joe Perches Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nf_conntrack_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 013cdf6..bb4188f 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);