From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 26 Mar 2021 00:42:50 +0000 (-0600)
Subject: Revert "Smack: Handle io_uring kernel thread privileges"
X-Git-Tag: v5.14-rc1~123^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0169d8f33ab7a58675a94c18122dba58d8f6a1b8;p=thirdparty%2Flinux.git

Revert "Smack: Handle io_uring kernel thread privileges"

This reverts commit 942cb357ae7d9249088e3687ee6a00ed2745a0c7.

The io_uring PF_IO_WORKER threads no longer have PF_KTHREAD set, so no
need to special case them for credential checks.

Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 7eabb448acab4..efe2406a39609 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -688,10 +688,9 @@ bool smack_privileged_cred(int cap, const struct cred *cred)
 bool smack_privileged(int cap)
 {
 	/*
-	 * Kernel threads may not have credentials we can use.
-	 * The io_uring kernel threads do have reliable credentials.
+	 * All kernel tasks are privileged
 	 */
-	if ((current->flags & (PF_KTHREAD | PF_IO_WORKER)) == PF_KTHREAD)
+	if (unlikely(current->flags & PF_KTHREAD))
 		return true;
 
 	return smack_privileged_cred(cap, current_cred());