From: Jens Axboe <[email protected]>
To: Hamza Mahfooz <[email protected]>,
[email protected], [email protected]
Cc: "Paul Moore" <[email protected]>,
"James Morris" <[email protected]>,
"Serge E. Hallyn" <[email protected]>,
"Pavel Begunkov" <[email protected]>,
"Stephen Smalley" <[email protected]>,
"Ondrej Mosnacek" <[email protected]>,
"Thiébaud Weksteen" <[email protected]>,
"Masahiro Yamada" <[email protected]>,
"Bram Bonné" <[email protected]>,
[email protected], [email protected]
Subject: Re: [PATCH] lsm,io_uring: add LSM hooks for io_uring_setup()
Date: Thu, 19 Dec 2024 13:45:41 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 12/19/24 1:41 PM, Hamza Mahfooz wrote:
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index 06ff41484e29..0922bb0724c0 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -3806,29 +3806,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 security_uring_allowed();
> }
>
> 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);
> }
Please do a prep patch that makes io_uring_allowed() return the actual
error rather than true/false, then the rest of your patch can stand
alone.
--
Jens Axboe
next prev parent reply other threads:[~2024-12-19 20:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-19 20:41 [PATCH] lsm,io_uring: add LSM hooks for io_uring_setup() Hamza Mahfooz
2024-12-19 20:45 ` Jens Axboe [this message]
2024-12-19 21:34 ` Casey Schaufler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox