From patchwork Mon May 31 13:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Guy Briggs X-Patchwork-Id: 12289495 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=-16.1 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,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 F0791C47082 for ; Mon, 31 May 2021 13:49:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCAE661C38 for ; Mon, 31 May 2021 13:49:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231259AbhEaNux (ORCPT ); Mon, 31 May 2021 09:50:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32027 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231239AbhEaNrh (ORCPT ); Mon, 31 May 2021 09:47:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622468757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8/kzEZ+gdZBh/Nwa/sm6GIH+uwzsf4BvjPEAhah/HTA=; b=ZybS4GL5PLkv+5OTsqlnpikQrCz+b5TNZUQ82x0pQUR6iQhIL70wRrfbf7GuSEdSnV/cWF HnthdMDQ6AZvfPwFqNJrt+KRVzYCq5775jxCipG5GbbHDD8bCRByHFIJ6ahTcgx8Vx5Jyu 6wrO3fsxGbfvBv0l2/rYcmJGP20hG9o= 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-300-wT2cFsQHMIi4CH92TH_aww-1; Mon, 31 May 2021 09:45:53 -0400 X-MC-Unique: wT2cFsQHMIi4CH92TH_aww-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 524841075646; Mon, 31 May 2021 13:45:52 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.3.128.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0330E5C1B4; Mon, 31 May 2021 13:45:42 +0000 (UTC) From: Richard Guy Briggs To: Paul Moore , linux-audit@redhat.com, io-uring@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, Kumar Kartikeya Dwivedi , Jens Axboe , Alexander Viro , Richard Guy Briggs Subject: [PATCH 1/2] audit: add filtering for io_uring records, addendum Date: Mon, 31 May 2021 09:44:54 -0400 Message-Id: <3a2903574a4d03f73230047866112b2dad9b4a9e.1622467740.git.rgb@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The commit ("audit: add filtering for io_uring records") added support for filtering io_uring operations. Add checks to the audit io_uring filtering code for directory and path watches, and to keep the list counts consistent. Signed-off-by: Richard Guy Briggs Reported-by: kernel test robot Reported-by: kernel test robot --- kernel/audit_tree.c | 3 ++- kernel/audit_watch.c | 3 ++- kernel/auditfilter.c | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 6c91902f4f45..2be285c2f069 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -727,7 +727,8 @@ int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op) { if (pathname[0] != '/' || - rule->listnr != AUDIT_FILTER_EXIT || + (rule->listnr != AUDIT_FILTER_EXIT && + rule->listnr != AUDIT_FILTER_URING_EXIT) || op != Audit_equal || rule->inode_f || rule->watch || rule->tree) return -EINVAL; diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 2acf7ca49154..698b62b4a2ec 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -183,7 +183,8 @@ int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op) return -EOPNOTSUPP; if (path[0] != '/' || path[len-1] == '/' || - krule->listnr != AUDIT_FILTER_EXIT || + (krule->listnr != AUDIT_FILTER_EXIT && + krule->listnr != AUDIT_FILTER_URING_EXIT) || op != Audit_equal || krule->inode_f || krule->watch || krule->tree) return -EINVAL; diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index c21119c00504..bcdedfd1088c 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -153,7 +153,8 @@ char *audit_unpack_string(void **bufp, size_t *remain, size_t len) static inline int audit_to_inode(struct audit_krule *krule, struct audit_field *f) { - if (krule->listnr != AUDIT_FILTER_EXIT || + if ((krule->listnr != AUDIT_FILTER_EXIT && + krule->listnr != AUDIT_FILTER_URING_EXIT) || krule->inode_f || krule->watch || krule->tree || (f->op != Audit_equal && f->op != Audit_not_equal)) return -EINVAL; @@ -250,6 +251,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data * pr_err("AUDIT_FILTER_ENTRY is deprecated\n"); goto exit_err; case AUDIT_FILTER_EXIT: + case AUDIT_FILTER_URING_EXIT: case AUDIT_FILTER_TASK: #endif case AUDIT_FILTER_USER: @@ -982,7 +984,8 @@ static inline int audit_add_rule(struct audit_entry *entry) } entry->rule.prio = ~0ULL; - if (entry->rule.listnr == AUDIT_FILTER_EXIT) { + if (entry->rule.listnr == AUDIT_FILTER_EXIT || + entry->rule.listnr == AUDIT_FILTER_URING_EXIT) { if (entry->rule.flags & AUDIT_FILTER_PREPEND) entry->rule.prio = ++prio_high; else From patchwork Mon May 31 13:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Guy Briggs X-Patchwork-Id: 12289497 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=-13.3 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,SPF_HELO_NONE,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 D4D55C4708F for ; Mon, 31 May 2021 13:49:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B343F61C35 for ; Mon, 31 May 2021 13:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232096AbhEaNu6 (ORCPT ); Mon, 31 May 2021 09:50:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53189 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232977AbhEaNrj (ORCPT ); Mon, 31 May 2021 09:47:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622468759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y54MkJ1DkDPUmNpg6ptgLnrQ5/7BnVMsItBiTZSYR8Q=; b=U/ffQNWsGWzo+UviRzP3xE4wjTrZ8lThoMyWmEk2Hx2OnHYnexzApeMsvMWkS0MTMYPUh/ z5vK9mYNBH/ODqPopWq3Iy6xuw4x+9s7DRYa8dWT6V0bcIXSBqbT8/rt0rluPKXZfUnY1I jnE4BDkdrSBSKj99SFDM/fZcP2enL4A= 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-593-AjF5-yO5PKy1ZPlxqlSV7A-1; Mon, 31 May 2021 09:45:57 -0400 X-MC-Unique: AjF5-yO5PKy1ZPlxqlSV7A-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 E7774189C44F; Mon, 31 May 2021 13:45:54 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.3.128.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3B5B5C1B4; Mon, 31 May 2021 13:45:52 +0000 (UTC) From: Richard Guy Briggs To: Paul Moore , linux-audit@redhat.com, io-uring@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, Kumar Kartikeya Dwivedi , Jens Axboe , Alexander Viro , Richard Guy Briggs Subject: [PATCH 2/2] audit: block PERM fields being used with io_uring filtering Date: Mon, 31 May 2021 09:44:55 -0400 Message-Id: <8d1435a4b5db9139cc8eebce633f14872dd3a007.1622467740.git.rgb@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The commit ("audit: add filtering for io_uring records") added support for filtering io_uring operations. The PERM field is invalid for io_uring filtering, so block it. Signed-off-by: Richard Guy Briggs --- kernel/auditfilter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index bcdedfd1088c..d75acb014ccd 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -336,6 +336,10 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f) if (entry->rule.listnr != AUDIT_FILTER_FS) return -EINVAL; break; + case AUDIT_PERM: + if (entry->rule.listnr == AUDIT_FILTER_URING_EXIT) + return -EINVAL; + break; } switch (entry->rule.listnr) {