public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH v3 1/2] io_uring: refactor io_uring_allowed()
@ 2025-01-27 15:57 Hamza Mahfooz
  2025-01-27 15:57 ` [PATCH v3 2/2] lsm,io_uring: add LSM hooks for io_uring_setup() Hamza Mahfooz
  0 siblings, 1 reply; 8+ messages in thread
From: Hamza Mahfooz @ 2025-01-27 15:57 UTC (permalink / raw)
  To: linux-kernel
  Cc: Hamza Mahfooz, Jens Axboe, Paul Moore, James Morris,
	Serge E. Hallyn, Pavel Begunkov, Stephen Smalley, Ondrej Mosnacek,
	Thiébaud Weksteen, Christian Göttsche, Bram Bonné,
	Masahiro Yamada, linux-security-module, io-uring, selinux

Have io_uring_allowed() return an error code directly instead of
true/false. This is needed for follow-up work to guard io_uring_setup()
with LSM.

Cc: Jens Axboe <[email protected]>
Signed-off-by: Hamza Mahfooz <[email protected]>
---
 io_uring/io_uring.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 7bfbc7c22367..c2d8bd4c2cfc 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3789,29 +3789,36 @@ static long io_uring_setup(u32 entries, struct io_uring_params __user *params)
 	return io_uring_create(entries, &p, params);
 }
 
-static inline bool io_uring_allowed(void)
+static inline int io_uring_allowed(void)
 {
 	int disabled = READ_ONCE(sysctl_io_uring_disabled);
 	kgid_t io_uring_group;
 
 	if (disabled == 2)
-		return false;
+		return -EPERM;
 
 	if (disabled == 0 || capable(CAP_SYS_ADMIN))
-		return true;
+		goto allowed_lsm;
 
 	io_uring_group = make_kgid(&init_user_ns, sysctl_io_uring_group);
 	if (!gid_valid(io_uring_group))
-		return false;
+		return -EPERM;
+
+	if (!in_group_p(io_uring_group))
+		return -EPERM;
 
-	return in_group_p(io_uring_group);
+allowed_lsm:
+	return 0;
 }
 
 SYSCALL_DEFINE2(io_uring_setup, u32, entries,
 		struct io_uring_params __user *, params)
 {
-	if (!io_uring_allowed())
-		return -EPERM;
+	int ret;
+
+	ret = io_uring_allowed();
+	if (ret)
+		return ret;
 
 	return io_uring_setup(entries, params);
 }
-- 
2.47.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-01-30 17:15 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-27 15:57 [PATCH v3 1/2] io_uring: refactor io_uring_allowed() Hamza Mahfooz
2025-01-27 15:57 ` [PATCH v3 2/2] lsm,io_uring: add LSM hooks for io_uring_setup() Hamza Mahfooz
2025-01-27 17:18   ` Casey Schaufler
2025-01-27 21:23     ` Paul Moore
2025-01-28  0:23       ` Casey Schaufler
2025-01-28 22:35         ` Paul Moore
2025-01-29  0:02           ` Casey Schaufler
2025-01-30 17:15             ` Paul Moore

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox