From: Bart Van Assche <bvanassche@acm.org>
To: "Christian Göttsche" <cgzones@googlemail.com>, selinux@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, Serge Hallyn <serge@hallyn.com>,
Alistair Delva <adelva@google.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: Re: [PATCH v3 3/8] block: use new capable_any functionality
Date: Wed, 15 Jun 2022 20:00:17 -0700 [thread overview]
Message-ID: <7fd6f544-0bd2-62fe-bddd-869364f351e8@acm.org> (raw)
In-Reply-To: <20220615152623.311223-2-cgzones@googlemail.com>
On 6/15/22 08:26, Christian Göttsche wrote:
> Use the new added capable_any function in appropriate cases, where a
> task is required to have any of two capabilities.
>
> Reorder CAP_SYS_ADMIN last.
>
> Fixes: 94c4b4fd25e6 ("block: Check ADMIN before NICE for IOPRIO_CLASS_RT")
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
> ---
> v3:
> rename to capable_any()
> ---
> block/ioprio.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/block/ioprio.c b/block/ioprio.c
> index 2fe068fcaad5..6441c052f837 100644
> --- a/block/ioprio.c
> +++ b/block/ioprio.c
> @@ -37,14 +37,7 @@ int ioprio_check_cap(int ioprio)
>
> switch (class) {
> case IOPRIO_CLASS_RT:
> - /*
> - * Originally this only checked for CAP_SYS_ADMIN,
> - * which was implicitly allowed for pid 0 by security
> - * modules such as SELinux. Make sure we check
> - * CAP_SYS_ADMIN first to avoid a denial/avc for
> - * possibly missing CAP_SYS_NICE permission.
> - */
> - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_NICE))
> + if (!capable_any(CAP_SYS_NICE, CAP_SYS_ADMIN))
> return -EPERM;
> fallthrough;
> /* rt has prio field too */
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
next prev parent reply other threads:[~2022-06-16 3:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 14:49 [RFC PATCH 2/2] capability: use new capable_or functionality Christian Göttsche
2022-02-17 14:49 ` [RFC PATCH 1/2] capability: add capable_or to test for multiple caps with exactly one audit message Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 2/8] capability: use new capable_or functionality Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 3/8] block: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 4/8] drivers: " Christian Göttsche
2022-05-09 10:44 ` Jiri Slaby
2022-05-09 10:46 ` Hans Verkuil
2022-05-02 16:00 ` [PATCH v2 5/8] fs: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 6/8] kernel: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 7/8] kernel/bpf: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche
2022-05-09 17:15 ` Serge E. Hallyn
2022-05-22 17:33 ` Serge E. Hallyn
2022-05-02 16:00 ` [PATCH v2 1/8] capability: add capable_or to test for multiple caps with exactly one audit message Christian Göttsche
2022-05-09 17:12 ` Serge E. Hallyn
2022-06-15 15:26 ` [PATCH v3 2/8] capability: use new capable_any functionality Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 3/8] block: " Christian Göttsche
2022-06-16 3:00 ` Bart Van Assche [this message]
2022-06-15 15:26 ` [PATCH v3 4/8] drivers: " Christian Göttsche
2022-06-15 15:45 ` Laurent Pinchart
2022-06-15 15:26 ` [PATCH v3 5/8] fs: " Christian Göttsche
2022-06-28 12:56 ` Christian Brauner
2022-06-28 14:11 ` Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 6/8] kernel: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 7/8] bpf: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 8/8] net: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 1/8] capability: add any wrapper to test for multiple caps with exactly one audit message Christian Göttsche
2022-06-26 22:34 ` Serge E. Hallyn
2022-08-30 15:05 ` Christian Göttsche
2022-08-30 15:10 ` Paul Moore
2022-09-02 0:56 ` Paul Moore
2022-09-02 1:35 ` Paul Moore
2022-02-17 17:29 ` [RFC PATCH 2/2] capability: use new capable_or functionality Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7fd6f544-0bd2-62fe-bddd-869364f351e8@acm.org \
--to=bvanassche@acm.org \
--cc=adelva@google.com \
--cc=axboe@kernel.dk \
--cc=cgzones@googlemail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=selinux@vger.kernel.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).