public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

exec: Move io_uring_task_cancel after the point of no return

Browse source 
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.

Link: https://lkml.kernel.org/r/878saih2op.fsf@x220.int.ebiederm.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2020-11-30 16:58:46 -06:00
parent c39ab6de22
commit 9ee1206dcf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/exec.c
View file

@ -1257,6 +1257,11 @@ int begin_new_exec(struct linux_binprm * bprm)
if (retval) if (retval)
goto out; goto out;
/*
* Cancel any io_uring activity across execve
*/
io_uring_task_cancel();
/* Ensure the files table is not shared. */ /* Ensure the files table is not shared. */
retval = unshare_files(); retval = unshare_files();
if (retval) if (retval)
@ -1783,11 +1788,6 @@ static int bprm_execve(struct linux_binprm *bprm,
struct file *file; struct file *file;
int retval; int retval;
/*
* Cancel any io_uring activity across execve
*/
io_uring_task_cancel();
retval = prepare_bprm_creds(bprm); retval = prepare_bprm_creds(bprm);
if (retval) if (retval)
return retval; return retval;