From patchwork Sun Jan 7 15:10:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 856562 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k57aJvbw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zF2066t9pz9s83 for ; Mon, 8 Jan 2018 02:10:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753797AbeAGPKa (ORCPT ); Sun, 7 Jan 2018 10:10:30 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34067 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753763AbeAGPKa (ORCPT ); Sun, 7 Jan 2018 10:10:30 -0500 Received: by mail-pf0-f193.google.com with SMTP id a90so4236050pfk.1 for ; Sun, 07 Jan 2018 07:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7fzaqbmfJ1XSc19ELknLeOFuWBPtZFwkwdXH40y18tU=; b=k57aJvbwpQ7pjED3cd1uZO2d4NNNMkEGIRka6xZjxi5JLUccUTd9qF93yt5SUmkNct R3OUWXkKgINpQaXOS/Pyf+/YmRsEnIL0zpoFkTCoAR6s/EmHuRsa0/Vyn4mr1Xyic4bA QtSIMzOOLFE2tHjIPF1UEZtPvjOY+OU+E0VpqXT3fzbbte1se3trYxeHYhvWqtLHcZMX e6QhVNq28osSoHFKx23UY02l0/sSyHF8LZq3OEOnLLr53VyYccbJgU0+exFuNShimvXW 3ljN9bWo9GM3pyXWHSyTjO8gJ/LOfZ4t1GbAsGVD4Xenwy+XthuXwE0ZOMOlH/OmVNmK QgTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7fzaqbmfJ1XSc19ELknLeOFuWBPtZFwkwdXH40y18tU=; b=jhTQfGHtKPIH7g+5L4gLtFPRjN4YkSuBXuInBTyA7Ujiinv238PR9skMeC+ssZv2Q5 bgANIuOUyRFBGqlMfqpZeG31uS7ZHTnvFNke4stwoKLTbJGezSxpvdxfe7nXtDWyAGYb 3sNxKJ6yQZil0dC+xffBqWtwx7jxazyA9xHEtP8V8Hy4Igy1CtHXyyBVrfi2pgWYudSw KkFrzl0Hjn6hnurZ+v7QoLwRMv+eSHyqOBQIVEWV8k9mKn5L71OoamHJUGTlZN3lQ4e4 YPCx9m+LyGtds/Q7UYgRVBRHthEKwK/L70Z153QJXu2aOncW1jXanL0kTbhCQ+uQVWeL NmQw== X-Gm-Message-State: AKGB3mJuB8RMAWMCzZGwdMtY0cC+yMfZbeiUzQt2d6iikJKmd4AqMin9 pkbCFvBDdn8XYc8Dh9vMYvs= X-Google-Smtp-Source: ACJfBov2phHQyq9F2E595lDWRXTpfGMbrz7zt9ecrRmHCH4CLwa+2lovlO1kJ6AjZLL5NJ7bcakuqA== X-Received: by 10.99.125.66 with SMTP id m2mr7402351pgn.146.1515337829582; Sun, 07 Jan 2018 07:10:29 -0800 (PST) Received: from localhost.localdomain ([125.130.197.10]) by smtp.gmail.com with ESMTPSA id 84sm24907879pfp.180.2018.01.07.07.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 07:10:29 -0800 (PST) From: Taehee Yoo To: pablo@netfilter.org, fw@strlen.de, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH V5 4/5] netfilter: nf_nat_snmp_basic: use nf_ct_helper_log Date: Mon, 8 Jan 2018 00:10:21 +0900 Message-Id: <20180107151021.26281-1-ap420073@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Use nf_ct_helper_log to write log message. Signed-off-by: Taehee Yoo --- V5 : - fix sparse error V4 : - rename nf_nat_snmp_basic.c to nf_nat_snmp_basic_main.c to fix compile error V3 : - be separated by previous patch. V2 : - Add missing nf_nat_snmp_basic.asn1 file V1 : - Initial patch net/ipv4/netfilter/nf_nat_snmp_basic.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index c8ac57f..7f7d847 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c @@ -1109,7 +1109,7 @@ static int snmp_translate(struct nf_conn *ct, int dir, struct sk_buff *skb) if (!snmp_parse_mangle((unsigned char *)udph + sizeof(struct udphdr), paylen, &map, &udph->check)) { - net_warn_ratelimited("bsalg: parser failed\n"); + nf_ct_helper_log(skb, ct, "parser failed\n"); return NF_DROP; } return NF_ACCEPT; @@ -1143,13 +1143,14 @@ static int help(struct sk_buff *skb, unsigned int protoff, * can mess around with the payload. */ if (ntohs(udph->len) != skb->len - (iph->ihl << 2)) { - net_warn_ratelimited("SNMP: dropping malformed packet src=%pI4 dst=%pI4\n", - &iph->saddr, &iph->daddr); - return NF_DROP; + nf_ct_helper_log(skb, ct, "dropping malformed packet\n"); + return NF_DROP; } - if (!skb_make_writable(skb, skb->len)) + if (!skb_make_writable(skb, skb->len)) { + nf_ct_helper_log(skb, ct, "cannot mangle packet"); return NF_DROP; + } spin_lock_bh(&snmp_lock); ret = snmp_translate(ct, dir, skb);