[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <7fd6f544-0bd2-62fe-bddd-869364f351e8@acm.org>
Date: Wed, 15 Jun 2022 20:00:17 -0700
From: Bart Van Assche <bvanassche@....org>
To: Christian Göttsche <cgzones@...glemail.com>,
selinux@...r.kernel.org
Cc: Jens Axboe <axboe@...nel.dk>, Serge Hallyn <serge@...lyn.com>,
Alistair Delva <adelva@...gle.com>,
linux-block@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org
Subject: Re: [PATCH v3 3/8] block: use new capable_any functionality
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@...glemail.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@....org>
Powered by blists - more mailing lists