From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 26 Mar 2021 16:05:25 +0000 (-0600)
Subject: tomoyo: don't special case PF_IO_WORKER for PF_KTHREAD
X-Git-Tag: xarray-5.18~2214^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4e53d1701b574b1ee9d500b4913a1ece2fac8911;p=users%2Fwilly%2Fxarray.git

tomoyo: don't special case PF_IO_WORKER for PF_KTHREAD

Since commit 3bfe6106693b6b4b ("io-wq: fork worker threads from original
task") stopped using PF_KTHREAD flag for the io_uring PF_IO_WORKER threads,
tomoyo_kernel_service() no longer needs to check PF_IO_WORKER flag.

(This is a 5.12+ patch. Please don't send to stable kernels.)

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---

diff --git a/security/tomoyo/network.c b/security/tomoyo/network.c
index 478f757ff843..8dc61335f65e 100644
--- a/security/tomoyo/network.c
+++ b/security/tomoyo/network.c
@@ -613,7 +613,7 @@ static int tomoyo_check_unix_address(struct sockaddr *addr,
 static bool tomoyo_kernel_service(void)
 {
 	/* Nothing to do if I am a kernel service. */
-	return (current->flags & (PF_KTHREAD | PF_IO_WORKER)) == PF_KTHREAD;
+	return current->flags & PF_KTHREAD;
 }
 
 /**