From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B04BDC33CAF for ; Wed, 22 Jan 2020 21:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C63C21835 for ; Wed, 22 Jan 2020 21:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore-com.20150623.gappssmtp.com header.i=@paul-moore-com.20150623.gappssmtp.com header.b="SajScBwd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729239AbgAVV2h (ORCPT ); Wed, 22 Jan 2020 16:28:37 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39540 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729182AbgAVV2f (ORCPT ); Wed, 22 Jan 2020 16:28:35 -0500 Received: by mail-lj1-f195.google.com with SMTP id o11so720107ljc.6 for ; Wed, 22 Jan 2020 13:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PP/urhQquewzkG31d0Bv7dDFia5iR+GM30A5qGisAZo=; b=SajScBwd4/UgrKZ/eVeac0PAAa2fMsMBlaOt+S4HYTMSTOVX1fean3ODPcrMpj6p2j jHIQdCzp3GGZYgZu4+713u5JCIJvtBaGV8GyCv+TZtPHE9JwAYOE4vI2XNoQQ3vXnpY6 WSDE6fmUWAO7J2BZRwVEFvWzel/QXOW1O5NvulCVV+pdmbStD3TY81ncvW1bpughUSE7 2SIe/PWiNyn5zX0M/wObHzpX0R32aAyIk8Qzzh9YZ4xbukPkHxb9FX3006vvXGHBsvWj XgFf9H3u7iPfs4x4kJu4mOE5CEV2LIJZkk4/6a/VIKBehACNhWRJMwRhP0IZNpAJ4JcM bSHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PP/urhQquewzkG31d0Bv7dDFia5iR+GM30A5qGisAZo=; b=YyQlXZkYFeD4ht35fCpu04mXLwAP1VglDa5mluK7yeFQwwaG2XMR5+/zLCA2S7ipPP DB9agaRF2p452Bwrd/4lMubs5PPdEZ4+vKxE6oqVRqGzXMUVBXtdV1M2fOanaGN0S6Zt R85ekx9eGdg9gSx/Vn6cKOD9nSc2TG2Cjltx5tUMZ4aFm7MxeAqQP9idhPYlljjsUhfJ 85CVS+Zu3BrMc64nMzASVI45ehTbE5LUM9jbjFqnVCzOJ2SjMKxlV7RqFSHK7pgJRAY+ qkqZkc5YfUqnlwUu/C06bUbbs0+TOhcG4GXWO/iW8N3QO7SVciwEknDoBPrWMZ4Z1gsN alyQ== X-Gm-Message-State: APjAAAXOK2qn24o4yipZ6c4CSt2BY9DPfS6iNft1Fc3LggUSfTP7uoV9 l0S4HZ7ukqiysv/4jixRNIav0QbLLzzjcCzIs3U6 X-Google-Smtp-Source: APXvYqzouLX05x7dEZusBBRcnAKMMWYsgy2d+H9MFjd13MPyiEyOVYhFhGf6qiCbTeoXa/XkPTez2v/ENY6/zc2Zo34= X-Received: by 2002:a2e:6f19:: with SMTP id k25mr20795552ljc.84.1579728513965; Wed, 22 Jan 2020 13:28:33 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Paul Moore Date: Wed, 22 Jan 2020 16:28:22 -0500 Message-ID: Subject: Re: [PATCH ghak90 V8 05/16] audit: log drop of contid on exit of last task To: Richard Guy Briggs Cc: containers@lists.linux-foundation.org, linux-api@vger.kernel.org, Linux-Audit Mailing List , linux-fsdevel@vger.kernel.org, LKML , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, sgrubb@redhat.com, omosnace@redhat.com, dhowells@redhat.com, simo@redhat.com, Eric Paris , Serge Hallyn , ebiederm@xmission.com, nhorman@tuxdriver.com, Dan Walsh , mpatel@redhat.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 31, 2019 at 2:50 PM Richard Guy Briggs wrote: > > Since we are tracking the life of each audit container indentifier, we > can match the creation event with the destruction event. Log the > destruction of the audit container identifier when the last process in > that container exits. > > Signed-off-by: Richard Guy Briggs > --- > kernel/audit.c | 17 +++++++++++++++++ > kernel/audit.h | 2 ++ > kernel/auditsc.c | 2 ++ > 3 files changed, 21 insertions(+) > > diff --git a/kernel/audit.c b/kernel/audit.c > index 4bab20f5f781..fa8f1aa3a605 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -2502,6 +2502,23 @@ int audit_set_contid(struct task_struct *task, u64 contid) > return rc; > } > > +void audit_log_container_drop(void) > +{ > + struct audit_buffer *ab; > + > + if (!current->audit || !current->audit->cont || > + refcount_read(¤t->audit->cont->refcount) > 1) > + return; > + ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONTAINER_OP); > + if (!ab) > + return; > + > + audit_log_format(ab, "op=drop opid=%d contid=%llu old-contid=%llu", > + task_tgid_nr(current), audit_get_contid(current), > + audit_get_contid(current)); > + audit_log_end(ab); > +} Assumine we are careful about where we call it in audit_free(...), you are confident we can't do this as part of _audit_contobj_put(...), yes? > /** > * audit_log_end - end one audit record > * @ab: the audit_buffer > diff --git a/kernel/audit.h b/kernel/audit.h > index e4a31aa92dfe..162de8366b32 100644 > --- a/kernel/audit.h > +++ b/kernel/audit.h > @@ -255,6 +255,8 @@ extern void audit_log_d_path_exe(struct audit_buffer *ab, > extern struct tty_struct *audit_get_tty(void); > extern void audit_put_tty(struct tty_struct *tty); > > +extern void audit_log_container_drop(void); > + > /* audit watch/mark/tree functions */ > #ifdef CONFIG_AUDITSYSCALL > extern unsigned int audit_serial(void); > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 0e2d50533959..bd855794ad26 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -1568,6 +1568,8 @@ static void audit_log_exit(void) > > audit_log_proctitle(); > > + audit_log_container_drop(); > + > /* Send end of event record to help user space know we are finished */ > ab = audit_log_start(context, GFP_KERNEL, AUDIT_EOE); > if (ab) > -- > 1.8.3.1 > -- paul moore www.paul-moore.com