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=-9.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=unavailable 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 593B3C43381 for ; Mon, 18 Mar 2019 20:03:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C72B20872 for ; Mon, 18 Mar 2019 20:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727425AbfCRUDD (ORCPT ); Mon, 18 Mar 2019 16:03:03 -0400 Received: from mail-ot1-f65.google.com ([209.85.210.65]:43374 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726776AbfCRUDD (ORCPT ); Mon, 18 Mar 2019 16:03:03 -0400 Received: by mail-ot1-f65.google.com with SMTP id u15so5465562otq.10 for ; Mon, 18 Mar 2019 13:03:02 -0700 (PDT) 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=GQu5Or/I2/5gczy9t5fi72JMJ1cTsvU9rGeuUkxzwWI=; b=nTIOYmWfGVZ0nfBPTMUnLS7HOWT+MA6gxIYgEH/1D8GcBBDvOVV7vydI28XLwqjdCL lqGHVSbN1gLa75BJE8OPVt25OGO9VMez9GY/7fivgimYv6VpPtcCPrmSdF6RUgiN1a/r F6c+Dlyqr+dPWR5UJCNHDUfeOHuUO1C07ol0QK5wwsI5LuB0eg2VJqRanFK61H5wCd9X w3U1JEYHslFsFKprN8XpIy4mYTCJG3Dan0hfSJjXluOksrPGRAkuY8yyuWK9dfc6eOZe 6Xqbn3GMbivh5MtlBF64/AjDbFfYk8uXfo1GmdzVP8XqE42434zX+bZj656xhPsRGUZ8 GjIA== X-Gm-Message-State: APjAAAW2JnPhhveomrP57bCGS9aDofsXjOOfBhlL1kDTidgU/Bn3IZA3 vfLOcFfS74nsl16YsoWJLpKm8xgc8hLt97V0OKv1YA== X-Google-Smtp-Source: APXvYqydRy4XsrE2SVExOk+UXdCNbiEpzbsMbFcold2tI6I+4SKPuoZA5znxr5s7g2YzWGfOAlmkWIbBMWBbFXCQLCA= X-Received: by 2002:a9d:1b2f:: with SMTP id l44mr11767478otl.217.1552939382383; Mon, 18 Mar 2019 13:03:02 -0700 (PDT) MIME-Version: 1.0 References: <3f02f7b56d2fba2918ff6fe90fcfa3ae558faff8.1552665316.git.rgb@redhat.com> In-Reply-To: <3f02f7b56d2fba2918ff6fe90fcfa3ae558faff8.1552665316.git.rgb@redhat.com> From: Ondrej Mosnacek Date: Mon, 18 Mar 2019 21:02:50 +0100 Message-ID: Subject: Re: [PATCH ghak90 V5 08/10] audit: add containerid filtering 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, Paul Moore , Steve Grubb , David Howells , simo@redhat.com, Eric Paris , "Serge E. Hallyn" , "Eric W . Biederman" , nhorman@tuxdriver.com Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Fri, Mar 15, 2019 at 7:35 PM Richard Guy Briggs wrote: > > Implement audit container identifier filtering using the AUDIT_CONTID > field name to send an 8-character string representing a u64 since the > value field is only u32. > > Sending it as two u32 was considered, but gathering and comparing two > fields was more complex. > > The feature indicator is AUDIT_FEATURE_BITMAP_CONTAINERID. > > See: https://github.com/linux-audit/audit-kernel/issues/91 > See: https://github.com/linux-audit/audit-userspace/issues/40 > See: https://github.com/linux-audit/audit-testsuite/issues/64 > See: https://github.com/linux-audit/audit-kernel/wiki/RFE-Audit-Container-ID > Signed-off-by: Richard Guy Briggs > Acked-by: Serge Hallyn > --- > include/linux/audit.h | 1 + > include/uapi/linux/audit.h | 5 ++++- > kernel/audit.h | 1 + > kernel/auditfilter.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ > kernel/auditsc.c | 3 +++ > 5 files changed, 56 insertions(+), 1 deletion(-) > > diff --git a/include/linux/audit.h b/include/linux/audit.h > index 6db5aba7cc01..fa19fa408931 100644 > --- a/include/linux/audit.h > +++ b/include/linux/audit.h > @@ -77,6 +77,7 @@ struct audit_field { > u32 type; > union { > u32 val; > + u64 val64; > kuid_t uid; > kgid_t gid; > struct { > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h > index a6383e28b2c8..741ab6f38294 100644 > --- a/include/uapi/linux/audit.h > +++ b/include/uapi/linux/audit.h > @@ -265,6 +265,7 @@ > #define AUDIT_LOGINUID_SET 24 > #define AUDIT_SESSIONID 25 /* Session ID */ > #define AUDIT_FSTYPE 26 /* FileSystem Type */ > +#define AUDIT_CONTID 27 /* Container ID */ > > /* These are ONLY useful when checking > * at syscall exit time (AUDIT_AT_EXIT). */ > @@ -345,6 +346,7 @@ enum { > #define AUDIT_FEATURE_BITMAP_SESSIONID_FILTER 0x00000010 > #define AUDIT_FEATURE_BITMAP_LOST_RESET 0x00000020 > #define AUDIT_FEATURE_BITMAP_FILTER_FS 0x00000040 > +#define AUDIT_FEATURE_BITMAP_CONTAINERID 0x00000080 > > #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \ > AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \ > @@ -352,7 +354,8 @@ enum { > AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND | \ > AUDIT_FEATURE_BITMAP_SESSIONID_FILTER | \ > AUDIT_FEATURE_BITMAP_LOST_RESET | \ > - AUDIT_FEATURE_BITMAP_FILTER_FS) > + AUDIT_FEATURE_BITMAP_FILTER_FS | \ > + AUDIT_FEATURE_BITMAP_CONTAINERID) > > /* deprecated: AUDIT_VERSION_* */ > #define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL > diff --git a/kernel/audit.h b/kernel/audit.h > index 2a1a8b8a8019..3a40b608bf8d 100644 > --- a/kernel/audit.h > +++ b/kernel/audit.h > @@ -230,6 +230,7 @@ static inline int audit_hash_ino(u32 ino) > > extern int audit_match_class(int class, unsigned syscall); > extern int audit_comparator(const u32 left, const u32 op, const u32 right); > +extern int audit_comparator64(const u64 left, const u32 op, const u64 right); > extern int audit_uid_comparator(kuid_t left, u32 op, kuid_t right); > extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t right); > extern int parent_len(const char *path); > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > index add360b46b38..516b8e58959e 100644 > --- a/kernel/auditfilter.c > +++ b/kernel/auditfilter.c > @@ -410,6 +410,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f) > /* FALL THROUGH */ > case AUDIT_ARCH: > case AUDIT_FSTYPE: > + case AUDIT_CONTID: > if (f->op != Audit_not_equal && f->op != Audit_equal) > return -EINVAL; > break; > @@ -582,6 +583,14 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, > } > entry->rule.exe = audit_mark; > break; > + case AUDIT_CONTID: > + if (f->val != sizeof(u64)) > + goto exit_free; > + str = audit_unpack_string(&bufp, &remain, f->val); > + if (IS_ERR(str)) > + goto exit_free; > + f->val64 = ((u64 *)str)[0]; > + break; > } > } > > @@ -664,6 +673,11 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) > data->buflen += data->values[i] = > audit_pack_string(&bufp, audit_mark_path(krule->exe)); > break; > + case AUDIT_CONTID: > + data->buflen += data->values[i] = sizeof(u64); > + for (i = 0; i < sizeof(u64); i++) > + ((char *)bufp)[i] = ((char *)&f->val64)[i]; How about just: memcpy(bufp, &f->val64, sizeof(u64)); instead of the awkward for loop? It is simpler and also more in line with the code in audit_pack_string(). Also, doesn't this loop interfere with the outer loop that also uses 'i' as the control variable? > + break; > case AUDIT_LOGINUID_SET: > if (krule->pflags & AUDIT_LOGINUID_LEGACY && !f->val) { > data->fields[i] = AUDIT_LOGINUID; > @@ -750,6 +764,10 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) > if (!gid_eq(a->fields[i].gid, b->fields[i].gid)) > return 1; > break; > + case AUDIT_CONTID: > + if (a->fields[i].val64 != b->fields[i].val64) > + return 1; > + break; > default: > if (a->fields[i].val != b->fields[i].val) > return 1; > @@ -1206,6 +1224,31 @@ int audit_comparator(u32 left, u32 op, u32 right) > } > } > > +int audit_comparator64(u64 left, u32 op, u64 right) > +{ > + switch (op) { > + case Audit_equal: > + return (left == right); > + case Audit_not_equal: > + return (left != right); > + case Audit_lt: > + return (left < right); > + case Audit_le: > + return (left <= right); > + case Audit_gt: > + return (left > right); > + case Audit_ge: > + return (left >= right); > + case Audit_bitmask: > + return (left & right); > + case Audit_bittest: > + return ((left & right) == right); > + default: > + BUG(); > + return 0; > + } > +} > + > int audit_uid_comparator(kuid_t left, u32 op, kuid_t right) > { > switch (op) { > @@ -1344,6 +1387,10 @@ int audit_filter(int msgtype, unsigned int listtype) > result = audit_comparator(audit_loginuid_set(current), > f->op, f->val); > break; > + case AUDIT_CONTID: > + result = audit_comparator64(audit_get_contid(current), > + f->op, f->val64); > + break; > case AUDIT_MSGTYPE: > result = audit_comparator(msgtype, f->op, f->val); > break; > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index aa5d13b4fbbb..2d74238e9638 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -616,6 +616,9 @@ static int audit_filter_rules(struct task_struct *tsk, > case AUDIT_LOGINUID_SET: > result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val); > break; > + case AUDIT_CONTID: > + result = audit_comparator64(audit_get_contid(tsk), f->op, f->val64); > + break; > case AUDIT_SUBJ_USER: > case AUDIT_SUBJ_ROLE: > case AUDIT_SUBJ_TYPE: > -- > 1.8.3.1 > -- Ondrej Mosnacek Associate Software Engineer, Security Technologies Red Hat, Inc.