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=-22.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 25DF9C43381 for ; Thu, 18 Mar 2021 12:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFB1464F59 for ; Thu, 18 Mar 2021 12:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230338AbhCRMIq (ORCPT ); Thu, 18 Mar 2021 08:08:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57633 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230400AbhCRMIV (ORCPT ); Thu, 18 Mar 2021 08:08:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616069301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JlDcllrQr7DBrDcUVIaiNqS6XDXXMP0YtmA9o1iIxrY=; b=BlcrYPYJACzBE8+j1S6ihTHc+MasvRZO9W2trJOlXBC1IzaigsWA9s00HpQQ4hOamhNzM2 6O3+ovyRHyBsZi3IzgMp8dtlysU3igKIHYDSmG5cVCOvHmWhYklLy72GkPbCdWnQmUJuO/ 6S1AxlLsZvOruFH/HPoDRps+kTHfRvw= 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-109-LtMXlIIPOV6X0T5SHt7tIw-1; Thu, 18 Mar 2021 08:08:17 -0400 X-MC-Unique: LtMXlIIPOV6X0T5SHt7tIw-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 DC2B9107B7C9; Thu, 18 Mar 2021 12:08:14 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.10.110.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 456A31002388; Thu, 18 Mar 2021 12:08:04 +0000 (UTC) Date: Thu, 18 Mar 2021 08:08:01 -0400 From: Richard Guy Briggs To: Christian Brauner Cc: Linux-Audit Mailing List , LKML , Paul Moore , Eric Paris , Steve Grubb , x86@kernel.org, Alexander Viro , Eric Paris , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-fsdevel@vger.kernel.org, Aleksa Sarai Subject: Re: [PATCH 1/2] audit: add support for the openat2 syscall Message-ID: <20210318120801.GK3141668@madcap2.tricolour.ca> References: <49510cacfb5fbbaa312a4a389f3a6619675007ab.1616031035.git.rgb@redhat.com> <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org On 2021-03-18 11:48, Christian Brauner wrote: > [+Cc Aleksa, the author of openat2()] Ah! Thanks for pulling in Aleksa. I thought I caught everyone... > and a comment below. :) Same... > On Wed, Mar 17, 2021 at 09:47:17PM -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. > > > > See the github issue > > https://github.com/linux-audit/audit-kernel/issues/67 > > > > Signed-off-by: Richard Guy Briggs > > --- > > 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 ++ > > kernel/auditsc.c | 3 +++ > > lib/audit.c | 4 ++++ > > lib/compat_audit.c | 4 ++++ > > 15 files changed, 35 insertions(+) > > > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > > index 96a9d18ff4c4..06a911b685d1 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > > index 5192ca899fe6..5eaa888c8fd3 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > > index 9eb47b2225d2..fc721a7727ba 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > > index 20c39c9d86a9..fc6d35918c44 100644 > > --- a/arch/parisc/kernel/compat_audit.c > > +++ b/arch/parisc/kernel/compat_audit.c > > @@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall) > > return 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > > index a2dddd7f3d09..8f32700b0baa 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > > index 55c6ccda0a85..ebe45534b1c9 100644 > > --- a/arch/powerpc/kernel/compat_audit.c > > +++ b/arch/powerpc/kernel/compat_audit.c > > @@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > > index d395c6c9944c..d964cb94cfaf 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > > index 444fb1f66944..f7b32933ce0e 100644 > > --- a/arch/s390/kernel/compat_audit.c > > +++ b/arch/s390/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > > index a6e91bf34d48..b6dcca9c6520 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > > index 10eeb4f15b20..d2652a1083ad 100644 > > --- a/arch/sparc/kernel/compat_audit.c > > +++ b/arch/sparc/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > > index 6efe6cb3768a..57a02ade5503 100644 > > --- a/arch/x86/ia32/audit.c > > +++ b/arch/x86/ia32/audit.c > > @@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall) > > case __NR_execve: > > case __NR_execveat: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > > index 83d9cad4e68b..39de1e021258 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 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > > index 8bb9ac84d2fb..f5616e70d129 100644 > > --- a/kernel/auditsc.c > > +++ b/kernel/auditsc.c > > @@ -76,6 +76,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "audit.h" > > > > @@ -195,6 +196,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > > case 5: /* execve */ > > return mask & AUDIT_PERM_EXEC; > > + case 6: /* openat2 */ > > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); > > That looks a bit dodgy. Maybe sm like the below would be a bit better? Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 47fb48f42c93..531e882a5096 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { > > static int audit_match_perm(struct audit_context *ctx, int mask) > { > + struct open_how *openat2; > unsigned n; > if (unlikely(!ctx)) > return 0; > @@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > case 5: /* execve */ > return mask & AUDIT_PERM_EXEC; > + case 6: /* openat2 */ > + openat2 = ctx->argv[2]; > + if (upper_32_bits(openat2->flags)) > + pr_warn("Some sensible warning about unknown flags"); > + > + return mask & ACC_MODE(lower_32_bits(openat2->flags)); > default: > return 0; > } > > (Ideally we'd probably notice at build-time that we've got flags > exceeding 32bits. Could probably easily been done by exposing an all > flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into > such places.) > > Christian - RGB -- Richard Guy Briggs 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 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=-22.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 9D09EC433E0 for ; Thu, 18 Mar 2021 12:08:23 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F295764F38 for ; Thu, 18 Mar 2021 12:08:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F295764F38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=linux-audit-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616069302; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Cz6pi3Vkt17INMzxsNnKPWwW8emt6y58Ceia/GaXv24=; b=K0ecKIzd6PopCryPLUf7Q8s39It1ksrrlxZmLsjJI4oi1FbE4Y4AfiTK3LljZfOXhOl8hA CPcdOBeWwN4i3qBz6YWizRbeOuKdlI4w0miYkOiAIrYFXWiDPKcAaX/zJVaVqesIpSycd2 6HDdf1zdWUBhCmw5fEcSKDVkFR6eWU0= 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-546-BoURUz3jOey_idFk5cwznw-1; Thu, 18 Mar 2021 08:08:20 -0400 X-MC-Unique: BoURUz3jOey_idFk5cwznw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F198E1899441; Thu, 18 Mar 2021 12:08:16 +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 D01BF5C8BE; Thu, 18 Mar 2021 12:08:16 +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 4127B1809C83; Thu, 18 Mar 2021 12:08:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12IC8EWx023105 for ; Thu, 18 Mar 2021 08:08:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D91AA1037E8C; Thu, 18 Mar 2021 12:08:14 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.10.110.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 456A31002388; Thu, 18 Mar 2021 12:08:04 +0000 (UTC) Date: Thu, 18 Mar 2021 08:08:01 -0400 From: Richard Guy Briggs To: Christian Brauner Subject: Re: [PATCH 1/2] audit: add support for the openat2 syscall Message-ID: <20210318120801.GK3141668@madcap2.tricolour.ca> References: <49510cacfb5fbbaa312a4a389f3a6619675007ab.1616031035.git.rgb@redhat.com> <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> MIME-Version: 1.0 In-Reply-To: <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: linux-audit@redhat.com Cc: linux-s390@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, x86@kernel.org, LKML , linux-fsdevel@vger.kernel.org, Aleksa Sarai , Linux-Audit Mailing List , Alexander Viro , linux-alpha@vger.kernel.org, sparclinux@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.79 on 10.5.11.16 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 2021-03-18 11:48, Christian Brauner wrote: > [+Cc Aleksa, the author of openat2()] Ah! Thanks for pulling in Aleksa. I thought I caught everyone... > and a comment below. :) Same... > On Wed, Mar 17, 2021 at 09:47:17PM -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. > > > > See the github issue > > https://github.com/linux-audit/audit-kernel/issues/67 > > > > Signed-off-by: Richard Guy Briggs > > --- > > 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 ++ > > kernel/auditsc.c | 3 +++ > > lib/audit.c | 4 ++++ > > lib/compat_audit.c | 4 ++++ > > 15 files changed, 35 insertions(+) > > > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > > index 96a9d18ff4c4..06a911b685d1 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > > index 5192ca899fe6..5eaa888c8fd3 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > > index 9eb47b2225d2..fc721a7727ba 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > > index 20c39c9d86a9..fc6d35918c44 100644 > > --- a/arch/parisc/kernel/compat_audit.c > > +++ b/arch/parisc/kernel/compat_audit.c > > @@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall) > > return 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > > index a2dddd7f3d09..8f32700b0baa 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > > index 55c6ccda0a85..ebe45534b1c9 100644 > > --- a/arch/powerpc/kernel/compat_audit.c > > +++ b/arch/powerpc/kernel/compat_audit.c > > @@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > > index d395c6c9944c..d964cb94cfaf 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > > index 444fb1f66944..f7b32933ce0e 100644 > > --- a/arch/s390/kernel/compat_audit.c > > +++ b/arch/s390/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > > index a6e91bf34d48..b6dcca9c6520 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > > index 10eeb4f15b20..d2652a1083ad 100644 > > --- a/arch/sparc/kernel/compat_audit.c > > +++ b/arch/sparc/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > > index 6efe6cb3768a..57a02ade5503 100644 > > --- a/arch/x86/ia32/audit.c > > +++ b/arch/x86/ia32/audit.c > > @@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall) > > case __NR_execve: > > case __NR_execveat: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > > index 83d9cad4e68b..39de1e021258 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 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > > index 8bb9ac84d2fb..f5616e70d129 100644 > > --- a/kernel/auditsc.c > > +++ b/kernel/auditsc.c > > @@ -76,6 +76,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "audit.h" > > > > @@ -195,6 +196,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > > case 5: /* execve */ > > return mask & AUDIT_PERM_EXEC; > > + case 6: /* openat2 */ > > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); > > That looks a bit dodgy. Maybe sm like the below would be a bit better? Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 47fb48f42c93..531e882a5096 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { > > static int audit_match_perm(struct audit_context *ctx, int mask) > { > + struct open_how *openat2; > unsigned n; > if (unlikely(!ctx)) > return 0; > @@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > case 5: /* execve */ > return mask & AUDIT_PERM_EXEC; > + case 6: /* openat2 */ > + openat2 = ctx->argv[2]; > + if (upper_32_bits(openat2->flags)) > + pr_warn("Some sensible warning about unknown flags"); > + > + return mask & ACC_MODE(lower_32_bits(openat2->flags)); > default: > return 0; > } > > (Ideally we'd probably notice at build-time that we've got flags > exceeding 32bits. Could probably easily been done by exposing an all > flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into > such places.) > > Christian - RGB -- Richard Guy Briggs 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 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit 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=-20.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 B9069C433E0 for ; Thu, 18 Mar 2021 12:08:50 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 22F6964E89 for ; Thu, 18 Mar 2021 12:08:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22F6964E89 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4F1QmJ1B17z3c1B for ; Thu, 18 Mar 2021 23:08:48 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FcBbbxKB; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FcBbbxKB; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=216.205.24.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=rgb@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FcBbbxKB; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FcBbbxKB; dkim-atps=neutral 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 lists.ozlabs.org (Postfix) with ESMTPS id 4F1Qlp6PVsz30D6 for ; Thu, 18 Mar 2021 23:08:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616069299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JlDcllrQr7DBrDcUVIaiNqS6XDXXMP0YtmA9o1iIxrY=; b=FcBbbxKBfcdcae7kMThWjKP/+KRYFtMf1BqowmxPgqupMjl4lph0T5ymTm10N275LRrG40 8j9Yq6mWRMvpHYyIK1bvLV2Ypb/kJrAy8EEpqXK4dDsI8e8OaCRz33WWDT0/fXBogFsEDz FUHROQKhnIm1ouOyWM7pgFOEN2uYLgM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616069299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JlDcllrQr7DBrDcUVIaiNqS6XDXXMP0YtmA9o1iIxrY=; b=FcBbbxKBfcdcae7kMThWjKP/+KRYFtMf1BqowmxPgqupMjl4lph0T5ymTm10N275LRrG40 8j9Yq6mWRMvpHYyIK1bvLV2Ypb/kJrAy8EEpqXK4dDsI8e8OaCRz33WWDT0/fXBogFsEDz FUHROQKhnIm1ouOyWM7pgFOEN2uYLgM= 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-109-LtMXlIIPOV6X0T5SHt7tIw-1; Thu, 18 Mar 2021 08:08:17 -0400 X-MC-Unique: LtMXlIIPOV6X0T5SHt7tIw-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 DC2B9107B7C9; Thu, 18 Mar 2021 12:08:14 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.10.110.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 456A31002388; Thu, 18 Mar 2021 12:08:04 +0000 (UTC) Date: Thu, 18 Mar 2021 08:08:01 -0400 From: Richard Guy Briggs To: Christian Brauner Subject: Re: [PATCH 1/2] audit: add support for the openat2 syscall Message-ID: <20210318120801.GK3141668@madcap2.tricolour.ca> References: <49510cacfb5fbbaa312a4a389f3a6619675007ab.1616031035.git.rgb@redhat.com> <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, linux-ia64@vger.kernel.org, Paul Moore , linux-parisc@vger.kernel.org, x86@kernel.org, LKML , Eric Paris , linux-fsdevel@vger.kernel.org, Aleksa Sarai , Linux-Audit Mailing List , Alexander Viro , linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org, Eric Paris , Steve Grubb , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 2021-03-18 11:48, Christian Brauner wrote: > [+Cc Aleksa, the author of openat2()] Ah! Thanks for pulling in Aleksa. I thought I caught everyone... > and a comment below. :) Same... > On Wed, Mar 17, 2021 at 09:47:17PM -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. > > > > See the github issue > > https://github.com/linux-audit/audit-kernel/issues/67 > > > > Signed-off-by: Richard Guy Briggs > > --- > > 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 ++ > > kernel/auditsc.c | 3 +++ > > lib/audit.c | 4 ++++ > > lib/compat_audit.c | 4 ++++ > > 15 files changed, 35 insertions(+) > > > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > > index 96a9d18ff4c4..06a911b685d1 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > > index 5192ca899fe6..5eaa888c8fd3 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > > index 9eb47b2225d2..fc721a7727ba 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > > index 20c39c9d86a9..fc6d35918c44 100644 > > --- a/arch/parisc/kernel/compat_audit.c > > +++ b/arch/parisc/kernel/compat_audit.c > > @@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall) > > return 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > > index a2dddd7f3d09..8f32700b0baa 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > > index 55c6ccda0a85..ebe45534b1c9 100644 > > --- a/arch/powerpc/kernel/compat_audit.c > > +++ b/arch/powerpc/kernel/compat_audit.c > > @@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > > index d395c6c9944c..d964cb94cfaf 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > > index 444fb1f66944..f7b32933ce0e 100644 > > --- a/arch/s390/kernel/compat_audit.c > > +++ b/arch/s390/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > > index a6e91bf34d48..b6dcca9c6520 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > > index 10eeb4f15b20..d2652a1083ad 100644 > > --- a/arch/sparc/kernel/compat_audit.c > > +++ b/arch/sparc/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > > index 6efe6cb3768a..57a02ade5503 100644 > > --- a/arch/x86/ia32/audit.c > > +++ b/arch/x86/ia32/audit.c > > @@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall) > > case __NR_execve: > > case __NR_execveat: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > > index 83d9cad4e68b..39de1e021258 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 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > > index 8bb9ac84d2fb..f5616e70d129 100644 > > --- a/kernel/auditsc.c > > +++ b/kernel/auditsc.c > > @@ -76,6 +76,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "audit.h" > > > > @@ -195,6 +196,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > > case 5: /* execve */ > > return mask & AUDIT_PERM_EXEC; > > + case 6: /* openat2 */ > > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); > > That looks a bit dodgy. Maybe sm like the below would be a bit better? Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 47fb48f42c93..531e882a5096 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { > > static int audit_match_perm(struct audit_context *ctx, int mask) > { > + struct open_how *openat2; > unsigned n; > if (unlikely(!ctx)) > return 0; > @@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > case 5: /* execve */ > return mask & AUDIT_PERM_EXEC; > + case 6: /* openat2 */ > + openat2 = ctx->argv[2]; > + if (upper_32_bits(openat2->flags)) > + pr_warn("Some sensible warning about unknown flags"); > + > + return mask & ACC_MODE(lower_32_bits(openat2->flags)); > default: > return 0; > } > > (Ideally we'd probably notice at build-time that we've got flags > exceeding 32bits. Could probably easily been done by exposing an all > flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into > such places.) > > Christian - RGB -- Richard Guy Briggs 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Guy Briggs Date: Thu, 18 Mar 2021 12:08:01 +0000 Subject: Re: [PATCH 1/2] audit: add support for the openat2 syscall Message-Id: <20210318120801.GK3141668@madcap2.tricolour.ca> List-Id: References: <49510cacfb5fbbaa312a4a389f3a6619675007ab.1616031035.git.rgb@redhat.com> <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> In-Reply-To: <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christian Brauner Cc: Linux-Audit Mailing List , LKML , Paul Moore , Eric Paris , Steve Grubb , x86@kernel.org, Alexander Viro , Eric Paris , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-fsdevel@vger.kernel.org, Aleksa Sarai On 2021-03-18 11:48, Christian Brauner wrote: > [+Cc Aleksa, the author of openat2()] Ah! Thanks for pulling in Aleksa. I thought I caught everyone... > and a comment below. :) Same... > On Wed, Mar 17, 2021 at 09:47:17PM -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. > > > > See the github issue > > https://github.com/linux-audit/audit-kernel/issues/67 > > > > Signed-off-by: Richard Guy Briggs > > --- > > 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 ++ > > kernel/auditsc.c | 3 +++ > > lib/audit.c | 4 ++++ > > lib/compat_audit.c | 4 ++++ > > 15 files changed, 35 insertions(+) > > > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > > index 96a9d18ff4c4..06a911b685d1 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > > index 5192ca899fe6..5eaa888c8fd3 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > > index 9eb47b2225d2..fc721a7727ba 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > > index 20c39c9d86a9..fc6d35918c44 100644 > > --- a/arch/parisc/kernel/compat_audit.c > > +++ b/arch/parisc/kernel/compat_audit.c > > @@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall) > > return 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > > index a2dddd7f3d09..8f32700b0baa 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > > index 55c6ccda0a85..ebe45534b1c9 100644 > > --- a/arch/powerpc/kernel/compat_audit.c > > +++ b/arch/powerpc/kernel/compat_audit.c > > @@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > > index d395c6c9944c..d964cb94cfaf 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > > index 444fb1f66944..f7b32933ce0e 100644 > > --- a/arch/s390/kernel/compat_audit.c > > +++ b/arch/s390/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > > index a6e91bf34d48..b6dcca9c6520 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > > index 10eeb4f15b20..d2652a1083ad 100644 > > --- a/arch/sparc/kernel/compat_audit.c > > +++ b/arch/sparc/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > > index 6efe6cb3768a..57a02ade5503 100644 > > --- a/arch/x86/ia32/audit.c > > +++ b/arch/x86/ia32/audit.c > > @@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall) > > case __NR_execve: > > case __NR_execveat: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > > index 83d9cad4e68b..39de1e021258 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 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > > index 8bb9ac84d2fb..f5616e70d129 100644 > > --- a/kernel/auditsc.c > > +++ b/kernel/auditsc.c > > @@ -76,6 +76,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "audit.h" > > > > @@ -195,6 +196,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] = SYS_BIND); > > case 5: /* execve */ > > return mask & AUDIT_PERM_EXEC; > > + case 6: /* openat2 */ > > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); > > That looks a bit dodgy. Maybe sm like the below would be a bit better? Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 47fb48f42c93..531e882a5096 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { > > static int audit_match_perm(struct audit_context *ctx, int mask) > { > + struct open_how *openat2; > unsigned n; > if (unlikely(!ctx)) > return 0; > @@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] = SYS_BIND); > case 5: /* execve */ > return mask & AUDIT_PERM_EXEC; > + case 6: /* openat2 */ > + openat2 = ctx->argv[2]; > + if (upper_32_bits(openat2->flags)) > + pr_warn("Some sensible warning about unknown flags"); > + > + return mask & ACC_MODE(lower_32_bits(openat2->flags)); > default: > return 0; > } > > (Ideally we'd probably notice at build-time that we've got flags > exceeding 32bits. Could probably easily been done by exposing an all > flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into > such places.) > > Christian - RGB -- Richard Guy Briggs 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Guy Briggs Subject: Re: [PATCH 1/2] audit: add support for the openat2 syscall Date: Thu, 18 Mar 2021 08:08:01 -0400 Message-ID: <20210318120801.GK3141668@madcap2.tricolour.ca> References: <49510cacfb5fbbaa312a4a389f3a6619675007ab.1616031035.git.rgb@redhat.com> <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616069302; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Cz6pi3Vkt17INMzxsNnKPWwW8emt6y58Ceia/GaXv24=; b=K0ecKIzd6PopCryPLUf7Q8s39It1ksrrlxZmLsjJI4oi1FbE4Y4AfiTK3LljZfOXhOl8hA CPcdOBeWwN4i3qBz6YWizRbeOuKdlI4w0miYkOiAIrYFXWiDPKcAaX/zJVaVqesIpSycd2 6HDdf1zdWUBhCmw5fEcSKDVkFR6eWU0= In-Reply-To: <20210318104843.uiga6tmmhn5wfhbs@wittgenstein> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com Content-Disposition: inline To: Christian Brauner Cc: linux-s390@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, x86@kernel.org, LKML , linux-fsdevel@vger.kernel.org, Aleksa Sarai , Linux-Audit Mailing List , Alexander Viro , linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org, Eric Paris , linuxppc-dev@lists.ozlabs.org On 2021-03-18 11:48, Christian Brauner wrote: > [+Cc Aleksa, the author of openat2()] Ah! Thanks for pulling in Aleksa. I thought I caught everyone... > and a comment below. :) Same... > On Wed, Mar 17, 2021 at 09:47:17PM -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. > > > > See the github issue > > https://github.com/linux-audit/audit-kernel/issues/67 > > > > Signed-off-by: Richard Guy Briggs > > --- > > 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 ++ > > kernel/auditsc.c | 3 +++ > > lib/audit.c | 4 ++++ > > lib/compat_audit.c | 4 ++++ > > 15 files changed, 35 insertions(+) > > > > diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c > > index 96a9d18ff4c4..06a911b685d1 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c > > index 5192ca899fe6..5eaa888c8fd3 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c > > index 9eb47b2225d2..fc721a7727ba 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 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c > > index 20c39c9d86a9..fc6d35918c44 100644 > > --- a/arch/parisc/kernel/compat_audit.c > > +++ b/arch/parisc/kernel/compat_audit.c > > @@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall) > > return 3; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > > index a2dddd7f3d09..8f32700b0baa 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > > index 55c6ccda0a85..ebe45534b1c9 100644 > > --- a/arch/powerpc/kernel/compat_audit.c > > +++ b/arch/powerpc/kernel/compat_audit.c > > @@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c > > index d395c6c9944c..d964cb94cfaf 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c > > index 444fb1f66944..f7b32933ce0e 100644 > > --- a/arch/s390/kernel/compat_audit.c > > +++ b/arch/s390/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c > > index a6e91bf34d48..b6dcca9c6520 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 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c > > index 10eeb4f15b20..d2652a1083ad 100644 > > --- a/arch/sparc/kernel/compat_audit.c > > +++ b/arch/sparc/kernel/compat_audit.c > > @@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall) > > return 4; > > case __NR_execve: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c > > index 6efe6cb3768a..57a02ade5503 100644 > > --- a/arch/x86/ia32/audit.c > > +++ b/arch/x86/ia32/audit.c > > @@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall) > > case __NR_execve: > > case __NR_execveat: > > return 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 1; > > } > > diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c > > index 83d9cad4e68b..39de1e021258 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 5; > > + case __NR_openat2: > > + return 6; > > default: > > return 0; > > } > > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > > index 8bb9ac84d2fb..f5616e70d129 100644 > > --- a/kernel/auditsc.c > > +++ b/kernel/auditsc.c > > @@ -76,6 +76,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "audit.h" > > > > @@ -195,6 +196,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > > case 5: /* execve */ > > return mask & AUDIT_PERM_EXEC; > > + case 6: /* openat2 */ > > + return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags); > > That looks a bit dodgy. Maybe sm like the below would be a bit better? Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 47fb48f42c93..531e882a5096 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { > > static int audit_match_perm(struct audit_context *ctx, int mask) > { > + struct open_how *openat2; > unsigned n; > if (unlikely(!ctx)) > return 0; > @@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask) > return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND); > case 5: /* execve */ > return mask & AUDIT_PERM_EXEC; > + case 6: /* openat2 */ > + openat2 = ctx->argv[2]; > + if (upper_32_bits(openat2->flags)) > + pr_warn("Some sensible warning about unknown flags"); > + > + return mask & ACC_MODE(lower_32_bits(openat2->flags)); > default: > return 0; > } > > (Ideally we'd probably notice at build-time that we've got flags > exceeding 32bits. Could probably easily been done by exposing an all > flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into > such places.) > > Christian - RGB -- Richard Guy Briggs 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