summaryrefslogtreecommitdiff
authorJames Morris <james.morris@microsoft.com>2019-01-16 23:41:11 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-23 07:10:55 (GMT)
commita017e3968242552056ffeb9e803a8d9650c40159 (patch)
treeda065babde441d09db0534491ff28f42cbcf765c
parenteafdb5029c0697e79b852ff3de31b49368d7f20e (diff)
downloadcommon-a017e3968242552056ffeb9e803a8d9650c40159.zip
common-a017e3968242552056ffeb9e803a8d9650c40159.tar.gz
common-a017e3968242552056ffeb9e803a8d9650c40159.tar.bz2
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
-rw-r--r--security/security.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c
index f825304..112df16 100644
--- a/security/security.c
+++ b/security/security.c
@@ -904,6 +904,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);
}