From patchwork Mon Aug 7 13:44:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 798640 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lYmwP8dj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xQzLp5YRXz9s0Z for ; Mon, 7 Aug 2017 23:45:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbdHGNou (ORCPT ); Mon, 7 Aug 2017 09:44:50 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33271 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbdHGNor (ORCPT ); Mon, 7 Aug 2017 09:44:47 -0400 Received: by mail-lf0-f68.google.com with SMTP id 65so375927lfa.0; Mon, 07 Aug 2017 06:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N+zhXXDGY3xX/jeikbK7+hUU6rorjSIz8etj7++om0s=; b=lYmwP8djt/9xD5W5KuDR20JOPeKYWP1tc3W2DMkabHQPRNiiGBbQlCg8IEcvWRumY/ E3sr3TWrqURn6OZ7uSq0VV+qfKtBNXA2FCBObO9hoFEj2A9/fJoNi/W7hDsnYEhu2M4B r36C4Iwpm4yLNpmrjLNs4dorz2wZ1UyDzMUoWlxTHWZRwzxrWHeeqLpoqNfjnKfTqDPH fb4/ihEEu1rXuDkwcj08fpDtGRqHvkeINgW6uGIc+0Rh7BmQaGjUL9yw/7DJHu4Vmxby M0yUZrhS3qbnfU59JBVpUcmMcyaLXd4vaw+wAvf1CAbdbJiUs8o3txGBf/tu35ImpmnZ akbw== 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:in-reply-to :references; bh=N+zhXXDGY3xX/jeikbK7+hUU6rorjSIz8etj7++om0s=; b=LJgUiIsgaeY/wPB51L4LmI6ehjlciAPZVjOxTFUSCoL9cfFJmvedZalOeOJ8tUH2t1 3IAokOWi6Kekd7z1FxVcgesdM5QFI4sTcmz1ixhqvKQHxdA8++kipvsnDfpj0eT7miUK AudEvued+hCt/MaqJrFBSAFcjGrlkyVfmBcE9L1L2dxIemR5OkovMgVyJ+yxXsWDt3oG 0J16BcVRagcqL+ME9mMEcjS2WrK+qJavSzMy2apqrsFH6Hjs4LEC1WUljSIwGz9Ah5M4 JCXNvO3LPy9heNQE+15Mr5DDbBRuTi/G4YlruJytbR85rcMAQ+mZGHeF2ttFM0rDzJyv h46w== X-Gm-Message-State: AHYfb5iw5MjB3gxgGohojPimB7SZetxFcmORe2WLeKBi3mGorGsbDGc1 jkxOZSKgN/050w== X-Received: by 10.46.81.1 with SMTP id f1mr214374ljb.142.1502113485346; Mon, 07 Aug 2017 06:44:45 -0700 (PDT) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id t125sm2250907lff.6.2017.08.07.06.44.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Aug 2017 06:44:44 -0700 (PDT) From: Geliang Tang To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , Stephen Hemminger , "David S. Miller" Cc: Geliang Tang , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: ebtables: use audit_log() Date: Mon, 7 Aug 2017 21:44:25 +0800 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: <5f901760510d0dc6e6e971d4136c8d2d4e0a13fd.1502103408.git.geliangtang@gmail.com> References: <5f901760510d0dc6e6e971d4136c8d2d4e0a13fd.1502103408.git.geliangtang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use audit_log() instead of open-coding it. Signed-off-by: Geliang Tang --- net/bridge/netfilter/ebtables.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 9c6e619..54c7ef4 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1069,15 +1069,10 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl, #ifdef CONFIG_AUDIT if (audit_enabled) { - struct audit_buffer *ab; - - ab = audit_log_start(current->audit_context, GFP_KERNEL, - AUDIT_NETFILTER_CFG); - if (ab) { - audit_log_format(ab, "table=%s family=%u entries=%u", - repl->name, AF_BRIDGE, repl->nentries); - audit_log_end(ab); - } + audit_log(current->audit_context, GFP_KERNEL, + AUDIT_NETFILTER_CFG, + "table=%s family=%u entries=%u", + repl->name, AF_BRIDGE, repl->nentries); } #endif return ret;