From: ebiederm@xmission.com (Eric W. Biederman)
To: <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Oleg Nesterov <oleg@redhat.com>,
Al Viro <viro@ZenIV.linux.org.uk>,
Kees Cook <keescook@chromium.org>, Jens Axboe <axboe@kernel.dk>
Subject: Re: [PATCH] exec: Move io_uring_task_cancel after the point of no return
Date: Wed, 02 Dec 2020 09:21:57 -0600 [thread overview]
Message-ID: <87lfegcjxm.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <878saih2op.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Mon, 30 Nov 2020 16:58:46 -0600")
ebiederm@xmission.com (Eric W. Biederman) writes:
> Now that unshare_files happens in begin_new_exec after the point of no
> return, io_uring_task_cancel can also happen later.
>
> Effectively this means io_uring activities for a task are only canceled
> when exec succeeds.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
> ---
>
> This is against my exec-for-v5.11 branch
applied.
> fs/exec.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/exec.c b/fs/exec.c
> index 14fae2ec1c9d..9e9368603168 100644
> --- a/fs/exec.c
> +++ b/fs/exec.c
> @@ -1257,6 +1257,11 @@ int begin_new_exec(struct linux_binprm * bprm)
> if (retval)
> goto out;
>
> + /*
> + * Cancel any io_uring activity across execve
> + */
> + io_uring_task_cancel();
> +
> /* Ensure the files table is not shared. */
> retval = unshare_files();
> if (retval)
> @@ -1783,11 +1788,6 @@ static int bprm_execve(struct linux_binprm *bprm,
> struct file *file;
> int retval;
>
> - /*
> - * Cancel any io_uring activity across execve
> - */
> - io_uring_task_cancel();
> -
> retval = prepare_bprm_creds(bprm);
> if (retval)
> return retval;
prev parent reply other threads:[~2020-12-02 15:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 22:58 Eric W. Biederman
2020-12-02 15:21 ` Eric W. Biederman [this message]
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 \
--in-reply-to=87lfegcjxm.fsf@x220.int.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=axboe@kernel.dk \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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
all inboxes | Powered by JetHome®