summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-18 15:25:23 -0700
committerKees Cook <keescook@chromium.org>2017-08-01 12:02:48 -0700
commitddb4a1442def2a78b91a85b4251fb712ef23662b (patch)
tree2e6ed1b1f5f92f463afe5480cd947273e1d43671 /security/apparmor
parent520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff)
downloadlinux-stable-ddb4a1442def2a78b91a85b4251fb712ef23662b.tar.gz
linux-stable-ddb4a1442def2a78b91a85b4251fb712ef23662b.tar.bz2
linux-stable-ddb4a1442def2a78b91a85b4251fb712ef23662b.zip
exec: Rename bprm->cred_prepared to called_set_creds
The cred_prepared bprm flag has a misleading name. It has nothing to do with the bprm_prepare_cred hook, and actually tracks if bprm_set_creds has been called. Rename this flag and improve its comment. Cc: David Howells <dhowells@redhat.com> Cc: Stephen Smalley <sds@tycho.nsa.gov> Cc: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: John Johansen <john.johansen@canonical.com> Acked-by: James Morris <james.l.morris@oracle.com> Acked-by: Paul Moore <paul@paul-moore.com> Acked-by: Serge Hallyn <serge@hallyn.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/domain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index d0594446ae3f..67ec52cfc523 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -758,7 +758,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
file_inode(bprm->file)->i_mode
};
- if (bprm->cred_prepared)
+ if (bprm->called_set_creds)
return 0;
ctx = cred_ctx(bprm->cred);