diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-12-09 22:42:57 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-12-10 19:39:00 +0100 |
| commit | 878f12dbb8f514799d126544d59be4d2675caac3 (patch) | |
| tree | ec5a16bc7ca1fd440c8aa9f2bf29c21cd3189c62 /fs | |
| parent | Linux 5.10-rc1 (diff) | |
| download | linux-878f12dbb8f514799d126544d59be4d2675caac3.tar.xz linux-878f12dbb8f514799d126544d59be4d2675caac3.zip | |
exec: Don't open code get_close_on_exec
Al Viro pointed out that using the phrase "close_on_exec(fd,
rcu_dereference_raw(current->files->fdt))" instead of wrapping it in
rcu_read_lock(), rcu_read_unlock() is a very questionable
optimization[1].
Once wrapped with rcu_read_lock()/rcu_read_unlock() that phrase
becomes equivalent the helper function get_close_on_exec so
simplify the code and make it more robust by simply using
get_close_on_exec.
[1] https://lkml.kernel.org/r/20201207222214.GA4115853@ZenIV.linux.org.uk
Suggested-by: Al Viro <viro@ftp.linux.org.uk>
Link: https://lkml.kernel.org/r/87k0tqr6zi.fsf_-_@x220.int.ebiederm.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c index 547a2390baf5..9aabf6e8c904 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1808,8 +1808,7 @@ static int bprm_execve(struct linux_binprm *bprm, * inaccessible after exec. Relies on having exclusive access to * current->files (due to unshare_files above). */ - if (bprm->fdpath && - close_on_exec(fd, rcu_dereference_raw(current->files->fdt))) + if (bprm->fdpath && get_close_on_exec(fd)) bprm->interp_flags |= BINPRM_FLAGS_PATH_INACCESSIBLE; /* Set the unchanging part of bprm->cred */ |