On 2019-09-27 08:51, Neil Horman wrote:
> On Wed, Sep 18, 2019 at 09:22:23PM -0400, Richard Guy Briggs wrote:
> > Set an arbitrary limit on the number of audit container identifiers to
> > limit abuse.
> >
> > Signed-off-by: Richard Guy Briggs <rgb@xxxxxxxxxx>
> > ---
> > kernel/audit.c | 8 ++++++++
> > kernel/audit.h | 4 ++++
> > 2 files changed, 12 insertions(+)
> >
> > diff --git a/kernel/audit.c b/kernel/audit.c
> > index 53d13d638c63..329916534dd2 100644
> > --- a/kernel/audit.c
> > +++ b/kernel/audit.c
> > @@ -139,6 +139,7 @@ struct audit_net {
> > struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];
> > /* Hash for contid-based rules */
> > struct list_head audit_contid_hash[AUDIT_CONTID_BUCKETS];
> > +int audit_contid_count = 0;
> >
> > static struct kmem_cache *audit_buffer_cache;
> >
> > @@ -2384,6 +2385,7 @@ void audit_cont_put(struct audit_cont *cont)
> > put_task_struct(cont->owner);
> > list_del_rcu(&cont->list);
> > kfree_rcu(cont, rcu);
> > + audit_contid_count--;
> > }
> > }
> >
> > @@ -2456,6 +2458,11 @@ int audit_set_contid(struct task_struct *task, u64 contid)
> > goto conterror;
> > }
> > }
> > + /* Set max contids */
> > + if (audit_contid_count > AUDIT_CONTID_COUNT) {
> > + rc = -ENOSPC;
> > + goto conterror;
> > + }
> You should check for audit_contid_count == AUDIT_CONTID_COUNT here, no?
> or at least >=, since you increment it below. Otherwise its possible
> that you will exceed it by one in the full condition.
Yes, agreed.
> > if (!newcont) {
> > newcont = kmalloc(sizeof(struct audit_cont), GFP_ATOMIC);
> > if (newcont) {
> > @@ -2465,6 +2472,7 @@ int audit_set_contid(struct task_struct *task, u64 contid)
> > newcont->owner = current;
> > refcount_set(&newcont->refcount, 1);
> > list_add_rcu(&newcont->list, &audit_contid_hash[h]);
> > + audit_contid_count++;
> > } else {
> > rc = -ENOMEM;
> > goto conterror;
> > diff --git a/kernel/audit.h b/kernel/audit.h
> > index 162de8366b32..543f1334ba47 100644
> > --- a/kernel/audit.h
> > +++ b/kernel/audit.h
> > @@ -219,6 +219,10 @@ static inline int audit_hash_contid(u64 contid)
> > return (contid & (AUDIT_CONTID_BUCKETS-1));
> > }
> >
> > +extern int audit_contid_count;
> > +
> > +#define AUDIT_CONTID_COUNT 1 << 16
> > +
> Just to ask the question, since it wasn't clear in the changelog, what
> abuse are you avoiding here? Ostensibly you should be able to create as
> many container ids as you have space for, and the simple creation of
> container ids doesn't seem like the resource strain I would be concerned
> about here, given that an orchestrator can still create as many
> containers as the system will otherwise allow, which will consume
> significantly more ram/disk/etc.
Agreed. I'm not a huge fan of this, but included it as an optional
patch to address resource abuse concerns of Eric Beiderman. I'll push
it to the end of the patchset and make it clear it is optional unless I
hear a compelling reason to keep it.
A similar argument was used to make the audit queue length tunable
parameter unlimited.
> > /* Indicates that audit should log the full pathname. */
> > #define AUDIT_NAME_FULL -1
> >
> > --
> > 1.8.3.1
- RGB
--
Richard Guy Briggs <rgb@xxxxxxxxxx>
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
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/containers
