[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211124115706.507376250@linuxfoundation.org>
Date: Wed, 24 Nov 2021 12:58:46 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Alistair Delva <adelva@...gle.com>,
Khazhismel Kumykov <khazhy@...gle.com>,
Bart Van Assche <bvanassche@....org>,
Serge Hallyn <serge@...lyn.com>, Jens Axboe <axboe@...nel.dk>,
Paul Moore <paul@...l-moore.com>, selinux@...r.kernel.org,
linux-security-module@...r.kernel.org, kernel-team@...roid.com
Subject: [PATCH 5.10 130/154] block: Check ADMIN before NICE for IOPRIO_CLASS_RT
From: Alistair Delva <adelva@...gle.com>
commit 94c4b4fd25e6c3763941bdec3ad54f2204afa992 upstream.
Booting to Android userspace on 5.14 or newer triggers the following
SELinux denial:
avc: denied { sys_nice } for comm="init" capability=23
scontext=u:r:init:s0 tcontext=u:r:init:s0 tclass=capability
permissive=0
Init is PID 0 running as root, so it already has CAP_SYS_ADMIN. For
better compatibility with older SEPolicy, check ADMIN before NICE.
Fixes: 9d3a39a5f1e4 ("block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE")
Signed-off-by: Alistair Delva <adelva@...gle.com>
Cc: Khazhismel Kumykov <khazhy@...gle.com>
Cc: Bart Van Assche <bvanassche@....org>
Cc: Serge Hallyn <serge@...lyn.com>
Cc: Jens Axboe <axboe@...nel.dk>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Paul Moore <paul@...l-moore.com>
Cc: selinux@...r.kernel.org
Cc: linux-security-module@...r.kernel.org
Cc: kernel-team@...roid.com
Cc: stable@...r.kernel.org # v5.14+
Reviewed-by: Bart Van Assche <bvanassche@....org>
Acked-by: Serge Hallyn <serge@...lyn.com>
Link: https://lore.kernel.org/r/20211115181655.3608659-1-adelva@google.com
Signed-off-by: Jens Axboe <axboe@...nel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
block/ioprio.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -69,7 +69,14 @@ int ioprio_check_cap(int ioprio)
switch (class) {
case IOPRIO_CLASS_RT:
- if (!capable(CAP_SYS_NICE) && !capable(CAP_SYS_ADMIN))
+ /*
+ * 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))
return -EPERM;
fallthrough;
/* rt has prio field too */
Powered by blists - more mailing lists