{"id":809470,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809470/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478435-13160-4-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504478435-13160-4-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:40:14","name":"[26/47] netfilter: use audit_log()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a402ec62e16e2ad3e3365432dd711789385a27f4","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478435-13160-4-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1282,"url":"http://patchwork.ozlabs.org/api/1.2/series/1282/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1282","date":"2017-09-03T22:40:11","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/1282/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809470/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809470/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp3Q0MHLz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:45:38 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753286AbdICWkz (ORCPT );\n\tSun, 3 Sep 2017 18:40:55 -0400","from mail.us.es ([193.147.175.20]:52692 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753242AbdICWkw (ORCPT );\n\tSun, 3 Sep 2017 18:40:52 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 3C5BA190F65\n\tfor ;\n\tMon, 4 Sep 2017 00:40:26 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 2C7C2B503F\n\tfor ;\n\tMon, 4 Sep 2017 00:40:26 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 221DFB502D; Mon, 4 Sep 2017 00:40:26 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 2BF94B5024;\n\tMon, 4 Sep 2017 00:40:24 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:40:24 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: 1984lsi)\n\tby entrada.int (Postfix) with ESMTPA id D72D34265A20;\n\tMon, 4 Sep 2017 00:40:23 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 26/47] netfilter: use audit_log()","Date":"Mon, 4 Sep 2017 00:40:14 +0200","Message-Id":"<1504478435-13160-4-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504478435-13160-1-git-send-email-pablo@netfilter.org>","References":"<1504478435-13160-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Geliang Tang \n\nUse audit_log() instead of open-coding it.\n\nSigned-off-by: Geliang Tang \nSigned-off-by: Pablo Neira Ayuso \n---\n net/bridge/netfilter/ebtables.c | 13 ++++---------\n net/netfilter/x_tables.c | 14 ++++----------\n 2 files changed, 8 insertions(+), 19 deletions(-)","diff":"diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c\nindex 9c6e619f452b..54c7ef4e970e 100644\n--- a/net/bridge/netfilter/ebtables.c\n+++ b/net/bridge/netfilter/ebtables.c\n@@ -1069,15 +1069,10 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,\n \n #ifdef CONFIG_AUDIT\n \tif (audit_enabled) {\n-\t\tstruct audit_buffer *ab;\n-\n-\t\tab = audit_log_start(current->audit_context, GFP_KERNEL,\n-\t\t\t\t AUDIT_NETFILTER_CFG);\n-\t\tif (ab) {\n-\t\t\taudit_log_format(ab, \"table=%s family=%u entries=%u\",\n-\t\t\t\t\t repl->name, AF_BRIDGE, repl->nentries);\n-\t\t\taudit_log_end(ab);\n-\t\t}\n+\t\taudit_log(current->audit_context, GFP_KERNEL,\n+\t\t\t AUDIT_NETFILTER_CFG,\n+\t\t\t \"table=%s family=%u entries=%u\",\n+\t\t\t repl->name, AF_BRIDGE, repl->nentries);\n \t}\n #endif\n \treturn ret;\ndiff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c\nindex e1648238a9c9..c83a3b5e1c6c 100644\n--- a/net/netfilter/x_tables.c\n+++ b/net/netfilter/x_tables.c\n@@ -1192,16 +1192,10 @@ xt_replace_table(struct xt_table *table,\n \n #ifdef CONFIG_AUDIT\n \tif (audit_enabled) {\n-\t\tstruct audit_buffer *ab;\n-\n-\t\tab = audit_log_start(current->audit_context, GFP_KERNEL,\n-\t\t\t\t AUDIT_NETFILTER_CFG);\n-\t\tif (ab) {\n-\t\t\taudit_log_format(ab, \"table=%s family=%u entries=%u\",\n-\t\t\t\t\t table->name, table->af,\n-\t\t\t\t\t private->number);\n-\t\t\taudit_log_end(ab);\n-\t\t}\n+\t\taudit_log(current->audit_context, GFP_KERNEL,\n+\t\t\t AUDIT_NETFILTER_CFG,\n+\t\t\t \"table=%s family=%u entries=%u\",\n+\t\t\t table->name, table->af, private->number);\n \t}\n #endif\n \n","prefixes":["26/47"]}