From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Guy Briggs Subject: Re: [PATCH ghak90 V5 10/10] audit: NETFILTER_PKT: record each container ID associated with a netNS Date: Mon, 1 Apr 2019 13:50:13 -0400 Message-ID: <20190401175013.it2xwndd62svycwl@madcap2.tricolour.ca> References: <56127b2a5b82f15cb0d0f040502c2e3bb6945f30.1552665316.git.rgb@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: Paul Moore Cc: nhorman@tuxdriver.com, linux-api@vger.kernel.org, containers@lists.linux-foundation.org, LKML , dhowells@redhat.com, Linux-Audit Mailing List , netfilter-devel@vger.kernel.org, ebiederm@xmission.com, simo@redhat.com, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, Eric Paris , Serge Hallyn List-Id: linux-audit@redhat.com On 2019-04-01 10:50, Paul Moore wrote: > On Fri, Mar 15, 2019 at 2:35 PM Richard Guy Briggs 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 > > --- > > include/linux/audit.h | 5 +++++ > > kernel/audit.c | 41 +++++++++++++++++++++++++++++++++++++++++ > > net/netfilter/nft_log.c | 11 +++++++++-- > > net/netfilter/xt_AUDIT.c | 11 +++++++++-- > > 4 files changed, 64 insertions(+), 4 deletions(-) > > ... > > > diff --git a/kernel/audit.c b/kernel/audit.c > > index 7fa3194f5342..80ed323feeb5 100644 > > --- a/kernel/audit.c > > +++ b/kernel/audit.c > > @@ -451,6 +451,47 @@ void audit_switch_task_namespaces(struct nsproxy *ns, struct task_struct *p) > > audit_netns_contid_add(new->net_ns, contid); > > } > > > > +/** > > + * audit_log_netns_contid_list - List contids for the given network namespace > > + * @net: the network namespace of interest > > + * @context: the audit context to use > > + * > > + * Description: > > + * Issues a CONTAINER_ID record with a CSV list of contids associated > > + * with a network namespace to accompany a NETFILTER_PKT record. > > + */ > > +void audit_log_netns_contid_list(struct net *net, struct audit_context *context) > > +{ > > + struct audit_buffer *ab = NULL; > > + struct audit_contid *cont; > > + bool first = true; > > + struct audit_net *aunet; > > + > > + /* Generate AUDIT_CONTAINER_ID record with container ID CSV list */ > > + rcu_read_lock(); > > + aunet = net_generic(net, audit_net_id); > > + if (!aunet) > > + goto out; > > + list_for_each_entry_rcu(cont, &aunet->contid_list, list) { > > + if (first) { > > This is borderline nit-picky, but it seems like we could get rid of > "first" and just check to see if "ab" is still NULL. Yes, this is a better way, thank you. > > + ab = audit_log_start(context, GFP_ATOMIC, > > + AUDIT_CONTAINER_ID); > > + if (!ab) { > > + audit_log_lost("out of memory in audit_log_netns_contid_list"); > > + goto out; > > + } > > + audit_log_format(ab, "contid="); > > + } else > > + audit_log_format(ab, ","); > > + audit_log_format(ab, "%llu", cont->id); > > + first = false; > > + } > > + audit_log_end(ab); > > +out: > > + rcu_read_unlock(); > > +} > > +EXPORT_SYMBOL(audit_log_netns_contid_list); > > paul moore - RGB -- Richard Guy Briggs Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada IRC: rgb, SunRaycer Voice: +1.647.777.2635, Internal: (81) 32635