exec: Move io_uring_task_cancel after the point of no return
Subsystems (2)
PATCH 1/1 exec: Move io_uring_task_cancel after the point of no return
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 <[email protected]>
---
This is against my exec-for-v5.11 branch
fs/exec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/exec.c +5 -5
@@ -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;
Signature · 1 line
2.20.1
Eric W. Biederman
AppliedQuoted 10 lines · [email protected] (Eric W. Biederman) writes:
Now that
unshare_fileshappens inbegin_new_execafter the point of no return,io_uring_task_cancelcan also happen later.Effectively this means
io_uringactivities for a task are only canceled when exec succeeds.Signed-off-by Eric W. Biederman <[email protected]>---
This is against my exec-for-v5.11 branch
applied.
Quoted 31 lines
fs/exec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)fs/exec.c +5
-5@@ -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;