|author||James Morris <firstname.lastname@example.org>||2019-01-22 14:33:10 -0800|
|committer||James Morris <email@example.com>||2019-01-22 14:33:10 -0800|
|parent||LSM: Make some functions static (diff)|
|parent||Linux 5.0-rc3 (diff)|
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot of the LSM code.
Diffstat (limited to 'security/security.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c
index 3664fb9d5cf7..b6bff646d373 100644
@@ -1472,6 +1472,13 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
void security_cred_free(struct cred *cred)
+ * There is a failure case in prepare_creds() that
+ * may result in a call here with ->security being NULL.
+ if (unlikely(cred->security == NULL))