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=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 BBBB2C433B4 for ; Thu, 20 May 2021 12:52:04 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42F1E611AD for ; Thu, 20 May 2021 12:52:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42F1E611AD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ubuntu.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=linux-audit-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-ZWvV2mRTPh6FDcvFoCtl3g-1; Thu, 20 May 2021 08:51:43 -0400 X-MC-Unique: ZWvV2mRTPh6FDcvFoCtl3g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBC99107ACCA; Thu, 20 May 2021 12:51:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9684B100238C; Thu, 20 May 2021 12:51:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2C2B1180B463; Thu, 20 May 2021 12:51:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14K7wwJA001642 for ; Thu, 20 May 2021 03:58:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9FC3B209D0FB; Thu, 20 May 2021 07:58:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B27520A8C03 for ; Thu, 20 May 2021 07:58:55 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D5F91825061 for ; Thu, 20 May 2021 07:58:55 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-uCrNcDwuPF-EMHCqeGQ0OA-1; Thu, 20 May 2021 03:58:51 -0400 X-MC-Unique: uCrNcDwuPF-EMHCqeGQ0OA-1 Received: by mail.kernel.org (Postfix) with ESMTPSA id 937626101D; Thu, 20 May 2021 07:58:45 +0000 (UTC) Date: Thu, 20 May 2021 09:58:42 +0200 From: Christian Brauner To: Richard Guy Briggs Subject: Re: [PATCH v4 2/3] audit: add support for the openat2 syscall Message-ID: <20210520075842.vnbwbw6yffkybk6z@wittgenstein> References: MIME-Version: 1.0 In-Reply-To: X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: linux-audit@redhat.com X-Mailman-Approved-At: Thu, 20 May 2021 08:45:40 -0400 Cc: linux-s390@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, Arnd Bergmann , x86@kernel.org, LKML , Eric Paris , sparclinux@vger.kernel.org, Aleksa Sarai , Linux-Audit Mailing List , Alexander Viro , linux-alpha@vger.kernel.org, linux-fsdevel@vger.kernel.org, Eric Paris , linuxppc-dev@lists.ozlabs.org X-BeenThere: linux-audit@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=linux-audit-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed, May 19, 2021 at 04:00:21PM -0400, Richard Guy Briggs wrote: > The openat2(2) syscall was added in kernel v5.6 with commit fddb5d430ad9 > ("open: introduce openat2(2) syscall") > > Add the openat2(2) syscall to the audit syscall classifier. > > Link: https://github.com/linux-audit/audit-kernel/issues/67 > Signed-off-by: Richard Guy Briggs > Link: https://lore.kernel.org/r/f5f1a4d8699613f8c02ce762807228c841c2e26f.1621363275.git.rgb@redhat.com > --- > arch/alpha/kernel/audit.c | 2 ++ > arch/ia64/kernel/audit.c | 2 ++ > arch/parisc/kernel/audit.c | 2 ++ > arch/parisc/kernel/compat_audit.c | 2 ++ > arch/powerpc/kernel/audit.c | 2 ++ > arch/powerpc/kernel/compat_audit.c | 2 ++ > arch/s390/kernel/audit.c | 2 ++ > arch/s390/kernel/compat_audit.c | 2 ++ > arch/sparc/kernel/audit.c | 2 ++ > arch/sparc/kernel/compat_audit.c | 2 ++ > arch/x86/ia32/audit.c | 2 ++ > arch/x86/kernel/audit_64.c | 2 ++ > include/linux/auditsc_classmacros.h | 1 + > kernel/auditsc.c | 3 +++ > lib/audit.c | 4 ++++ > lib/compat_audit.c | 4 ++++ > 16 files changed, 36 insertions(+) > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > index 81cbd804e375..3ab04709784a 100644 > --- a/arch/alpha/kernel/audit.c > +++ b/arch/alpha/kernel/audit.c > @@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > return AUDITSC_OPENAT; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > index dba6a74c9ab3..ec61f20ca61f 100644 > --- a/arch/ia64/kernel/audit.c > +++ b/arch/ia64/kernel/audit.c > @@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > return AUDITSC_OPENAT; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > index 14244e83db75..f420b5552140 100644 > --- a/arch/parisc/kernel/audit.c > +++ b/arch/parisc/kernel/audit.c > @@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > return AUDITSC_OPENAT; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > index 1d6347d37d92..3ec490c28656 100644 > --- a/arch/parisc/kernel/compat_audit.c > +++ b/arch/parisc/kernel/compat_audit.c > @@ -36,6 +36,8 @@ int parisc32_classify_syscall(unsigned syscall) > return AUDITSC_OPENAT; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_COMPAT; > } > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > index 6eb18ef77dff..1bcfca5fdf67 100644 > --- a/arch/powerpc/kernel/audit.c > +++ b/arch/powerpc/kernel/audit.c > @@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > index b1dc2d1c4bad..251abf79d536 100644 > --- a/arch/powerpc/kernel/compat_audit.c > +++ b/arch/powerpc/kernel/compat_audit.c > @@ -39,6 +39,8 @@ int ppc32_classify_syscall(unsigned syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_COMPAT; > } > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > index 7e331e1831d4..02051a596b87 100644 > --- a/arch/s390/kernel/audit.c > +++ b/arch/s390/kernel/audit.c > @@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > index fc3d1c7ad21c..4b3d463e7d97 100644 > --- a/arch/s390/kernel/compat_audit.c > +++ b/arch/s390/kernel/compat_audit.c > @@ -40,6 +40,8 @@ int s390_classify_syscall(unsigned syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_COMPAT; > } > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > index 50fab35bdaba..b092274eca79 100644 > --- a/arch/sparc/kernel/audit.c > +++ b/arch/sparc/kernel/audit.c > @@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > index 1c1b6d075421..2a3f71206fc5 100644 > --- a/arch/sparc/kernel/compat_audit.c > +++ b/arch/sparc/kernel/compat_audit.c > @@ -40,6 +40,8 @@ int sparc32_classify_syscall(unsigned int syscall) > return AUDITSC_SOCKETCALL; > case __NR_execve: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_COMPAT; > } > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > index eedc37a1ee13..efc7d832fefb 100644 > --- a/arch/x86/ia32/audit.c > +++ b/arch/x86/ia32/audit.c > @@ -40,6 +40,8 @@ int ia32_classify_syscall(unsigned syscall) > case __NR_execve: > case __NR_execveat: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_COMPAT; > } > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > index 2a6cc9c9c881..44c3601cfdc4 100644 > --- a/arch/x86/kernel/audit_64.c > +++ b/arch/x86/kernel/audit_64.c > @@ -53,6 +53,8 @@ int audit_classify_syscall(int abi, unsigned syscall) > case __NR_execve: > case __NR_execveat: > return AUDITSC_EXECVE; > + case __NR_openat2: > + return AUDITSC_OPENAT2; > default: > return AUDITSC_NATIVE; > } > diff --git a/include/linux/auditsc_classmacros.h b/include/linux/auditsc_classmacros.h > index 18757d270961..dc8e72536dbd 100644 > --- a/include/linux/auditsc_classmacros.h > +++ b/include/linux/auditsc_classmacros.h > @@ -16,6 +16,7 @@ enum auditsc_class_t { > AUDITSC_OPENAT, > AUDITSC_SOCKETCALL, > AUDITSC_EXECVE, > + AUDITSC_OPENAT2, > > AUDITSC_NVALS /* count */ > }; > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index d775ea16505b..3f59ab209dfd 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -76,6 +76,7 @@ > #include > #include > #include > +#include > > #include "audit.h" > > @@ -196,6 +197,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > case AUDITSC_EXECVE: > return mask & AUDIT_PERM_EXEC; > + case AUDITSC_OPENAT2: > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); That's a lot of dereferncing, casting and masking all at once. Maybe a small static inline helper would be good for the sake of legibility? Sm like: static inline u32 audit_openat2_acc(struct open_how *how, int mask) { u32 flags = how->flags; return mask & ACC_MODE(flags); } but not sure. Just seems more legible to me. Otherwise. Acked-by: Christian Brauner -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit