From: Paul Moore <paul@paul-moore.com>
To: Richard Guy Briggs <rgb@redhat.com>
Cc: 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, netfilter-devel@vger.kernel.org,
sgrubb@redhat.com, Ondrej Mosnacek <omosnace@redhat.com>,
dhowells@redhat.com, simo@redhat.com,
Eric Paris <eparis@parisplace.org>,
Serge Hallyn <serge@hallyn.com>,
ebiederm@xmission.com, nhorman@tuxdriver.com,
Dan Walsh <dwalsh@redhat.com>,
mpatel@redhat.com
Subject: Re: [PATCH ghak90 V9 06/13] audit: add contid support for signalling the audit daemon
Date: Fri, 21 Aug 2020 14:48:01 -0400 [thread overview]
Message-ID: <CAHC9VhQoSH7Lza517WNr+6LaS7i890JPQfvisV6thLmnu01QOw@mail.gmail.com> (raw)
In-Reply-To: <20200729190025.mueangq3os3r7ew6@madcap2.tricolour.ca>
On Wed, Jul 29, 2020 at 3:00 PM Richard Guy Briggs <rgb@redhat.com> wrote:
> On 2020-07-05 11:10, Paul Moore wrote:
> > On Sat, Jun 27, 2020 at 9:22 AM Richard Guy Briggs <rgb@redhat.com> wrote:
> > >
> > > Add audit container identifier support to the action of signalling the
> > > audit daemon.
> > >
> > > Since this would need to add an element to the audit_sig_info struct,
> > > a new record type AUDIT_SIGNAL_INFO2 was created with a new
> > > audit_sig_info2 struct. Corresponding support is required in the
> > > userspace code to reflect the new record request and reply type.
> > > An older userspace won't break since it won't know to request this
> > > record type.
> > >
> > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> > > ---
> > > include/linux/audit.h | 8 ++++
> > > include/uapi/linux/audit.h | 1 +
> > > kernel/audit.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-
> > > security/selinux/nlmsgtab.c | 1 +
> > > 4 files changed, 104 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/include/linux/audit.h b/include/linux/audit.h
> > > index 5eeba0efffc2..89cf7c66abe6 100644
> > > --- a/include/linux/audit.h
> > > +++ b/include/linux/audit.h
> > > @@ -22,6 +22,13 @@ struct audit_sig_info {
> > > char ctx[];
> > > };
> > >
> > > +struct audit_sig_info2 {
> > > + uid_t uid;
> > > + pid_t pid;
> > > + u32 cid_len;
> > > + char data[];
> > > +};
> > > +
> > > struct audit_buffer;
> > > struct audit_context;
> > > struct inode;
> > > @@ -105,6 +112,7 @@ struct audit_contobj {
> > > u64 id;
> > > struct task_struct *owner;
> > > refcount_t refcount;
> > > + refcount_t sigflag;
> > > struct rcu_head rcu;
> > > };
> >
> > It seems like we need some protection in audit_set_contid() so that we
> > don't allow reuse of an audit container ID when "refcount == 0 &&
> > sigflag != 0", yes?
>
> We have it, see -ESHUTDOWN below.
That check in audit_set_contid() is checking ->refcount and not
->sigflag; ->sigflag is more important in this context, yes?
> > > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> > > index fd98460c983f..a56ad77069b9 100644
> > > --- a/include/uapi/linux/audit.h
> > > +++ b/include/uapi/linux/audit.h
> > > @@ -72,6 +72,7 @@
> > > #define AUDIT_SET_FEATURE 1018 /* Turn an audit feature on or off */
> > > #define AUDIT_GET_FEATURE 1019 /* Get which features are enabled */
> > > #define AUDIT_CONTAINER_OP 1020 /* Define the container id and info */
> > > +#define AUDIT_SIGNAL_INFO2 1021 /* Get info auditd signal sender */
> > >
> > > #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */
> > > #define AUDIT_USER_AVC 1107 /* We filter this differently */
> > > diff --git a/kernel/audit.c b/kernel/audit.c
> > > index a09f8f661234..54dd2cb69402 100644
> > > --- a/kernel/audit.c
> > > +++ b/kernel/audit.c
> > > @@ -126,6 +126,8 @@ struct auditd_connection {
> > > kuid_t audit_sig_uid = INVALID_UID;
> > > pid_t audit_sig_pid = -1;
> > > u32 audit_sig_sid = 0;
> > > +static struct audit_contobj *audit_sig_cid;
> > > +static struct task_struct *audit_sig_atsk;
> >
> > This looks like a typo, or did you mean "atsk" for some reason?
>
> No, I meant atsk to refer specifically to the audit daemon task and not
> any other random one that is doing the signalling. I can change it is
> there is a strong objection.
Esh, yeah, "atsk" looks too much like a typo ;) At the very leask add
a 'd' in there, e.g. "adtsk", but something better than that would be
welcome.
> > > @@ -2532,6 +2620,11 @@ int audit_set_contid(struct task_struct *task, u64 contid)
> > > if (cont->id == contid) {
> > > /* task injection to existing container */
> > > if (current == cont->owner) {
> > > + if (!refcount_read(&cont->refcount)) {
> > > + rc = -ESHUTDOWN;
> >
> > Reuse -ENOTUNIQ; I'm not overly excited about providing a lot of
> > detail here as these are global system objects. If you must have a
> > different errno (and I would prefer you didn't), use something like
> > -EBUSY.
>
> I don't understand the issue of "global system objects" since the only
> time this error would be issued is if its own contid were being reused
> but it hadn't cleaned up its own references yet by either issuing an
> AUDIT_SIGNAL_INFO* request or the targetted audit daemon hadn't cleaned
> up yet. EBUSY could be confused with already having spawned threads or
> children, and ENOTUNIQ could indicate that another orchestrator/engine
> had stolen its desired contid after we released it and wanted to reuse
> it.
All the more reason for ENOTUNIQ. The point is that the audit
container ID is not available for use, and since the IDs are shared
across the entire system I think we are better off having some
ambiquity here with errnos.
> This gets me thinking about making reservations for preferred
> contids that are otherwise unavailable and making callbacks to indicate
> when they become available, but that seems undesirably complex right
> now.
That is definitely beyond the scope of this work, or rather *should*
be beyond the scope of this work.
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2020-08-21 18:48 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-27 13:20 [PATCH ghak90 V9 00/13] audit: implement container identifier Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 01/13] audit: collect audit task parameters Richard Guy Briggs
2020-07-05 15:09 ` Paul Moore
2020-07-07 2:50 ` Richard Guy Briggs
2020-07-08 1:42 ` Paul Moore
2020-07-13 20:29 ` Richard Guy Briggs
2020-07-14 0:44 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 02/13] audit: add container id Richard Guy Briggs
2020-07-04 13:29 ` Paul Moore
2020-07-04 13:30 ` Paul Moore
2020-07-05 15:09 ` Paul Moore
2020-07-29 20:05 ` Richard Guy Briggs
2020-08-21 19:36 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 03/13] audit: read container ID of a process Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 04/13] audit: log drop of contid on exit of last task Richard Guy Briggs
2020-07-05 15:10 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 05/13] audit: log container info of syscalls Richard Guy Briggs
2020-07-05 15:10 ` Paul Moore
2020-07-29 19:40 ` Richard Guy Briggs
2020-08-21 19:15 ` Paul Moore
2020-10-02 19:52 ` Richard Guy Briggs
2020-10-21 16:39 ` Richard Guy Briggs
2020-10-21 16:49 ` Steve Grubb
2020-10-21 17:53 ` Richard Guy Briggs
2020-10-23 1:21 ` Paul Moore
2020-10-23 20:40 ` Richard Guy Briggs
2020-10-28 1:35 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 06/13] audit: add contid support for signalling the audit daemon Richard Guy Briggs
2020-07-05 15:10 ` Paul Moore
2020-07-29 19:00 ` Richard Guy Briggs
2020-08-21 18:48 ` Paul Moore [this message]
2020-10-02 19:25 ` Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 07/13] audit: add support for non-syscall auxiliary records Richard Guy Briggs
2020-07-05 15:11 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 08/13] audit: add containerid support for user records Richard Guy Briggs
2020-07-05 15:11 ` Paul Moore
2020-07-18 0:43 ` Richard Guy Briggs
2020-08-21 18:34 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 09/13] audit: add containerid filtering Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 10/13] audit: add support for containerid to network namespaces Richard Guy Briggs
2020-07-05 15:11 ` Paul Moore
2020-07-21 22:05 ` Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 11/13] audit: contid check descendancy and nesting Richard Guy Briggs
2020-07-05 15:11 ` Paul Moore
2020-08-07 17:10 ` Richard Guy Briggs
2020-08-21 20:13 ` Paul Moore
2020-10-06 20:03 ` Richard Guy Briggs
2020-06-27 13:20 ` [PATCH ghak90 V9 12/13] audit: track container nesting Richard Guy Briggs
2020-07-05 15:11 ` Paul Moore
2020-06-27 13:20 ` [PATCH ghak90 V9 13/13] audit: add capcontid to set contid outside init_user_ns Richard Guy Briggs
2020-07-05 15:11 ` 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=CAHC9VhQoSH7Lza517WNr+6LaS7i890JPQfvisV6thLmnu01QOw@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=containers@lists.linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=dwalsh@redhat.com \
--cc=ebiederm@xmission.com \
--cc=eparis@parisplace.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-audit@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatel@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=omosnace@redhat.com \
--cc=rgb@redhat.com \
--cc=serge@hallyn.com \
--cc=sgrubb@redhat.com \
--cc=simo@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).