From: Laura Garcia <nevola@gmail.com>
To: Richard Guy Briggs <rgb@redhat.com>
Cc: cgroups@vger.kernel.org, containers@lists.linux-foundation.org,
linux-api@vger.kernel.org,
Linux-Audit Mailing List <linux-audit@redhat.com>,
linux-fsdevel@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, luto@kernel.org, jlayton@redhat.com,
carlos@redhat.com, viro@zeniv.linux.org.uk, dhowells@redhat.com,
simo@redhat.com, eparis@parisplace.org, serge@hallyn.com,
ebiederm@xmission.com,
Netfilter Development Mailing list
<netfilter-devel@vger.kernel.org>
Subject: Re: [RFC PATCH ghak90 (was ghak32) V3 08/10] audit: NETFILTER_PKT: record each container ID associated with a netNS
Date: Sat, 21 Jul 2018 17:32:38 +0200 [thread overview]
Message-ID: <CAF90-WhFVGKK7pxzRXnA=DGDzp-OZMWvoxfH0c+nm6+-Ao9Jag@mail.gmail.com> (raw)
In-Reply-To: <c6b64f6540e2e531636142ced36d51f0744d0e1f.1528304204.git.rgb@redhat.com>
CC'ing Netfilter.
On Wed, Jun 6, 2018 at 6:58 PM, Richard Guy Briggs <rgb@redhat.com> wrote:
> Add audit container identifier auxiliary record(s) to NETFILTER_PKT
> event standalone records. Iterate through all potential audit container
> identifiers associated with a network namespace.
>
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
> include/linux/audit.h | 5 +++++
> kernel/audit.c | 20 +++++++++++++++++++-
> kernel/auditsc.c | 2 ++
> net/netfilter/xt_AUDIT.c | 12 ++++++++++--
> 4 files changed, 36 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/audit.h b/include/linux/audit.h
> index 7e2e51c..4560a4e 100644
> --- a/include/linux/audit.h
> +++ b/include/linux/audit.h
> @@ -167,6 +167,8 @@ extern int audit_log_contid(struct audit_context *context,
> extern void audit_contid_add(struct net *net, u64 contid);
> extern void audit_contid_del(struct net *net, u64 contid);
> extern void audit_switch_task_namespaces(struct nsproxy *ns, struct task_struct *p);
> +extern void audit_log_contid_list(struct net *net,
> + struct audit_context *context);
>
> extern int audit_update_lsm_rules(void);
>
> @@ -231,6 +233,9 @@ static inline void audit_contid_del(struct net *net, u64 contid)
> { }
> static inline void audit_switch_task_namespaces(struct nsproxy *ns, struct task_struct *p)
> { }
> +static inline void audit_log_contid_list(struct net *net,
> + struct audit_context *context)
> +{ }
>
> #define audit_enabled 0
> #endif /* CONFIG_AUDIT */
> diff --git a/kernel/audit.c b/kernel/audit.c
> index ecd2de4..8cca41a 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -382,6 +382,20 @@ void audit_switch_task_namespaces(struct nsproxy *ns, struct task_struct *p)
> audit_contid_add(new->net_ns, contid);
> }
>
> +void audit_log_contid_list(struct net *net, struct audit_context *context)
> +{
> + struct audit_contid *cont;
> + int i = 0;
> +
> + list_for_each_entry(cont, audit_get_contid_list(net), list) {
> + char buf[14];
> +
> + sprintf(buf, "net%u", i++);
> + audit_log_contid(context, buf, cont->id);
> + }
> +}
> +EXPORT_SYMBOL(audit_log_contid_list);
> +
> void audit_panic(const char *message)
> {
> switch (audit_failure) {
> @@ -2132,17 +2146,21 @@ int audit_log_contid(struct audit_context *context,
> char *op, u64 contid)
> {
> struct audit_buffer *ab;
> + gfp_t gfpflags;
>
> if (!cid_valid(contid))
> return 0;
> + /* We can be called in atomic context via audit_tg() */
> + gfpflags = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL;
> /* Generate AUDIT_CONTAINER record with container ID */
> - ab = audit_log_start(context, GFP_KERNEL, AUDIT_CONTAINER);
> + ab = audit_log_start(context, gfpflags, AUDIT_CONTAINER);
> if (!ab)
> return -ENOMEM;
> audit_log_format(ab, "op=%s contid=%llu", op, contid);
> audit_log_end(ab);
> return 0;
> }
> +EXPORT_SYMBOL(audit_log_contid);
>
> void audit_log_key(struct audit_buffer *ab, char *key)
> {
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 6ab5e5e..e2a16d2 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -1015,6 +1015,7 @@ struct audit_context *audit_alloc_local(void)
> context->in_syscall = 1;
> return context;
> }
> +EXPORT_SYMBOL(audit_alloc_local);
>
> void audit_free_context(struct audit_context *context)
> {
> @@ -1029,6 +1030,7 @@ void audit_free_context(struct audit_context *context)
> audit_proctitle_free(context);
> kfree(context);
> }
> +EXPORT_SYMBOL(audit_free_context);
>
> static int audit_log_pid_context(struct audit_context *context, pid_t pid,
> kuid_t auid, kuid_t uid, unsigned int sessionid,
> diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
> index f368ee6..10d2707 100644
> --- a/net/netfilter/xt_AUDIT.c
> +++ b/net/netfilter/xt_AUDIT.c
> @@ -71,10 +71,13 @@ static bool audit_ip6(struct audit_buffer *ab, struct sk_buff *skb)
> {
> struct audit_buffer *ab;
> int fam = -1;
> + struct audit_context *context;
> + struct net *net;
>
> if (audit_enabled == 0)
> - goto errout;
> - ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
> + goto out;
> + context = audit_alloc_local();
> + ab = audit_log_start(context, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
> if (ab == NULL)
> goto errout;
>
> @@ -104,7 +107,12 @@ static bool audit_ip6(struct audit_buffer *ab, struct sk_buff *skb)
>
> audit_log_end(ab);
>
> + net = xt_net(par);
> + audit_log_contid_list(net, context);
> +
> errout:
> + audit_free_context(context);
> +out:
> return XT_CONTINUE;
> }
>
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2018-07-21 15:32 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-06 16:58 [RFC PATCH ghak90 (was ghak32) V3 00/10] audit: implement container identifier Richard Guy Briggs
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 01/10] audit: add container id Richard Guy Briggs
2018-06-06 17:56 ` Steve Grubb
2018-06-06 20:26 ` Richard Guy Briggs
2018-07-20 22:13 ` Paul Moore
2018-07-24 19:06 ` Richard Guy Briggs
2018-07-24 21:54 ` Paul Moore
2018-07-30 18:47 ` Richard Guy Briggs
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 02/10] audit: log container info of syscalls Richard Guy Briggs
2018-06-06 17:58 ` Steve Grubb
2018-07-20 22:13 ` Paul Moore
2018-07-21 20:29 ` Richard Guy Briggs
2018-07-22 13:32 ` Steve Grubb
2018-07-22 20:55 ` Richard Guy Briggs
2018-07-22 21:03 ` Richard Guy Briggs
2018-07-23 13:19 ` Steve Grubb
2018-07-23 15:11 ` Richard Guy Briggs
2018-07-23 16:48 ` Steve Grubb
2018-07-23 18:31 ` Paul Moore
2018-07-26 0:51 ` Richard Guy Briggs
2018-07-31 20:07 ` Richard Guy Briggs
2018-07-23 13:16 ` Paul Moore
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 03/10] audit: add containerid support for ptrace and signals Richard Guy Briggs
2018-07-20 22:13 ` Paul Moore
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 04/10] audit: add support for non-syscall auxiliary records Richard Guy Briggs
2018-07-20 22:14 ` Paul Moore
2018-07-24 19:37 ` Richard Guy Briggs
2018-07-24 21:57 ` Paul Moore
2018-07-26 14:30 ` Richard Guy Briggs
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 05/10] audit: add containerid support for tty_audit Richard Guy Briggs
2018-07-20 22:14 ` Paul Moore
2018-07-24 14:07 ` Richard Guy Briggs
2018-07-24 20:36 ` Paul Moore
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 06/10] audit: add containerid filtering Richard Guy Briggs
2018-07-20 22:14 ` Paul Moore
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 07/10] audit: add support for containerid to network namespaces Richard Guy Briggs
2018-07-20 22:14 ` Paul Moore
2018-07-24 14:03 ` Richard Guy Briggs
2018-07-24 20:33 ` Paul Moore
2018-07-26 13:33 ` Richard Guy Briggs
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 08/10] audit: NETFILTER_PKT: record each container ID associated with a netNS Richard Guy Briggs
2018-07-20 22:15 ` Paul Moore
2018-07-24 19:48 ` Steve Grubb
2018-07-24 20:22 ` Paul Moore
2018-07-24 20:55 ` Richard Guy Briggs
2018-07-21 15:32 ` Laura Garcia [this message]
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 09/10] debug audit: read container ID of a process Richard Guy Briggs
2018-07-20 22:15 ` Paul Moore
2018-07-21 19:21 ` Richard Guy Briggs
2018-06-06 16:58 ` [RFC PATCH ghak90 (was ghak32) V3 10/10] rfkill: fix spelling mistake contidion to condition Richard Guy Briggs
2018-07-18 20:56 ` Paul Moore
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='CAF90-WhFVGKK7pxzRXnA=DGDzp-OZMWvoxfH0c+nm6+-Ao9Jag@mail.gmail.com' \
--to=nevola@gmail.com \
--cc=carlos@redhat.com \
--cc=cgroups@vger.kernel.org \
--cc=containers@lists.linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=eparis@parisplace.org \
--cc=jlayton@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-audit@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=rgb@redhat.com \
--cc=serge@hallyn.com \
--cc=simo@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/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).