diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2020-05-31 15:02:36 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-05-31 15:02:36 -0500 |
commit | 3977e285ee89a94699255dbbf6eeea13889a1083 (patch) | |
tree | 378ea4452668d448b0834fd08008a5f81619f1fd /security/security.c | |
parent | e32f8879019535b899bc3d51f371e17526f208d1 (diff) | |
parent | 56305aa9b6fab91a5555a45796b79c1b0a6353d1 (diff) | |
download | linux-stable-3977e285ee89a94699255dbbf6eeea13889a1083.tar.gz linux-stable-3977e285ee89a94699255dbbf6eeea13889a1083.tar.bz2 linux-stable-3977e285ee89a94699255dbbf6eeea13889a1083.zip |
exec: Remove the recomputation of bprm->cred
Recomputing the uids, gids, capabilities, and related flags each time a
new bprm->file is set is error prone and unnecessary.
This set of changes splits per_clear temporarily into two separate
variables. This is the last change necessary to ensure that
everything that is computed from brpm->file in bprm->cred is
recomputed every time a new bprm->file is set. Then the code is
refactored to compute bprm->cred from bprm->file when the final
brpm->file is known, removing the need for recomputation entirely.
Doing this in two steps should allow anyone who has problems later to
bisect and tell if it was the semantic change or the refactoring that
caused them problems.
Eric W. Biederman (2):
exec: Add a per bprm->file version of per_clear
exec: Compute file based creds only once
fs/binfmt_misc.c | 2 +-
fs/exec.c | 57 ++++++++++++++++++-------------------------
include/linux/binfmts.h | 9 ++-----
include/linux/lsm_hook_defs.h | 2 +-
include/linux/lsm_hooks.h | 22 +++++++++--------
include/linux/security.h | 9 ++++---
security/commoncap.c | 22 +++++++++--------
security/security.c | 4 +--
8 files changed, 59 insertions(+), 68 deletions(-)
Merge branch 'exec-norecompute-v2' into exec-next
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index b890b7e2a765..259b8e750aa2 100644 --- a/security/security.c +++ b/security/security.c @@ -828,9 +828,9 @@ int security_bprm_creds_for_exec(struct linux_binprm *bprm) return call_int_hook(bprm_creds_for_exec, 0, bprm); } -int security_bprm_repopulate_creds(struct linux_binprm *bprm) +int security_bprm_creds_from_file(struct linux_binprm *bprm, struct file *file) { - return call_int_hook(bprm_repopulate_creds, 0, bprm); + return call_int_hook(bprm_creds_from_file, 0, bprm, file); } int security_bprm_check(struct linux_binprm *bprm) |