From: Richard Guy Briggs <rgb@redhat.com>
To: Linux-Audit Mailing List <linux-audit@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
netfilter-devel@vger.kernel.org
Cc: Paul Moore <paul@paul-moore.com>,
sgrubb@redhat.com, omosnace@redhat.com, fw@strlen.de,
twoerner@redhat.com, eparis@parisplace.org,
ebiederm@xmission.com, tgraf@infradead.org,
Richard Guy Briggs <rgb@redhat.com>
Subject: [PATCH ghak25 v2 9/9] netfilter: audit table unregister actions
Date: Mon, 6 Jan 2020 13:54:10 -0500 [thread overview]
Message-ID: <65974a7254dffe53b5084bedfd60c95a29a41e08.1577830902.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1577830902.git.rgb@redhat.com>
In-Reply-To: <cover.1577830902.git.rgb@redhat.com>
Audit the action of unregistering ebtables and x_tables.
See: https://github.com/linux-audit/audit-kernel/issues/44
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
kernel/auditsc.c | 3 ++-
net/bridge/netfilter/ebtables.c | 3 +++
net/netfilter/x_tables.c | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 999ac184246b..2644130a9e66 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2557,7 +2557,8 @@ void __audit_nf_cfg(const char *name, u8 af, int nentries, int op)
return; /* audit_panic or being filtered */
audit_log_format(ab, "table=%s family=%u entries=%u op=%s",
name, af, nentries,
- op ? "replace" : "register");
+ op == 1 ? "replace" :
+ (op ? "unregister" : "register"));
audit_log_end(ab);
}
EXPORT_SYMBOL_GPL(__audit_nf_cfg);
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index baff2f05af43..3dd4eb5b13fd 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1126,6 +1126,9 @@ static void __ebt_unregister_table(struct net *net, struct ebt_table *table)
mutex_lock(&ebt_mutex);
list_del(&table->list);
mutex_unlock(&ebt_mutex);
+ if (audit_enabled)
+ audit_nf_cfg(table->name, AF_BRIDGE, table->private->nentries,
+ 2);
EBT_ENTRY_ITERATE(table->private->entries, table->private->entries_size,
ebt_cleanup_entry, net, NULL);
if (table->private->nentries)
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 4ae4f7bf8946..e4852a0cb62f 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1403,7 +1403,7 @@ struct xt_table_info *xt_replace_table(struct xt_table *table,
if (audit_enabled)
audit_nf_cfg(table->name, table->af, private->number,
- private->number);
+ !!private->number);
return private;
}
@@ -1466,6 +1466,8 @@ void *xt_unregister_table(struct xt_table *table)
private = table->private;
list_del(&table->list);
mutex_unlock(&xt[table->af].mutex);
+ if (audit_enabled)
+ audit_nf_cfg(table->name, table->af, private->number, 2);
kfree(table);
return private;
--
1.8.3.1
next prev parent reply other threads:[~2020-01-06 18:56 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 18:54 [PATCH ghak25 v2 0/9] Address NETFILTER_CFG issues Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 1/9] netfilter: normalize x_table function declarations Richard Guy Briggs
2020-01-06 20:23 ` Florian Westphal
2020-01-08 16:47 ` Nicolas Dichtel
2020-01-16 21:29 ` Richard Guy Briggs
2020-01-31 3:17 ` Paul Moore
2020-02-10 19:13 ` Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 2/9] netfilter: normalize ebtables " Richard Guy Briggs
2020-01-06 20:30 ` Florian Westphal
2020-01-31 3:17 ` Paul Moore
2020-01-06 18:54 ` [PATCH ghak25 v2 3/9] netfilter: normalize ebtables function declarations II Richard Guy Briggs
2020-01-06 20:31 ` Florian Westphal
2020-01-31 3:17 ` Paul Moore
2020-01-06 18:54 ` [PATCH ghak25 v2 4/9] audit: record nfcfg params Richard Guy Briggs
2020-01-31 3:18 ` Paul Moore
2020-02-18 22:47 ` Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 5/9] netfilter: x_tables audit only on syscall rule Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 6/9] netfilter: ebtables " Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 7/9] netfilter: ebtables audit table registration Richard Guy Briggs
2020-01-31 3:18 ` Paul Moore
2020-02-18 22:35 ` Richard Guy Briggs
2020-01-06 18:54 ` [PATCH ghak25 v2 8/9] netfilter: add audit operation field Richard Guy Briggs
2020-01-06 20:23 ` Florian Westphal
2020-01-31 3:18 ` Paul Moore
2020-02-13 12:14 ` Richard Guy Briggs
2020-02-13 12:34 ` Florian Westphal
2020-02-13 14:29 ` Richard Guy Briggs
2020-01-06 18:54 ` Richard Guy Briggs [this message]
2020-01-31 3:18 ` [PATCH ghak25 v2 9/9] netfilter: audit table unregister actions Paul Moore
2020-01-16 15:05 ` [PATCH ghak25 v2 0/9] Address NETFILTER_CFG issues Pablo Neira Ayuso
2020-01-16 19:07 ` Paul Moore
2020-01-16 21:20 ` Richard Guy Briggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65974a7254dffe53b5084bedfd60c95a29a41e08.1577830902.git.rgb@redhat.com \
--to=rgb@redhat.com \
--cc=ebiederm@xmission.com \
--cc=eparis@parisplace.org \
--cc=fw@strlen.de \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=sgrubb@redhat.com \
--cc=tgraf@infradead.org \
--cc=twoerner@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).