summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2019-01-16 15:41:11 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-22 21:40:35 +0100
commita19aedf1a77c2e426c9810aece80646283cc2808 (patch)
tree0e86830ea92e22577d5efb9da8c5c73eb76b55e5 /security
parenta72e572f8a2d61db2f4d17e1de17fb92573870ef (diff)
downloadlinux-stable-a19aedf1a77c2e426c9810aece80646283cc2808.tar.gz
linux-stable-a19aedf1a77c2e426c9810aece80646283cc2808.tar.bz2
linux-stable-a19aedf1a77c2e426c9810aece80646283cc2808.zip
LSM: Check for NULL cred-security on free
commit a5795fd38ee8194451ba3f281f075301a3696ce2 upstream. From: Casey Schaufler <casey@schaufler-ca.com> Check that the cred security blob has been set before trying to clean it up. There is a case during credential initialization that could result in this. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: John Johansen <john.johansen@canonical.com> Signed-off-by: James Morris <james.morris@microsoft.com> Reported-by: syzbot+69ca07954461f189e808@syzkaller.appspotmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/security.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c
index 736e78da1ab9..5ce2448f3a45 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1003,6 +1003,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))
+ return;
+
call_void_hook(cred_free, cred);
}