commit 8cd77a0bd4b4a7d02c2a6926a69585d8088ee721
author Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Mon May 27 20:11:27 2013 +0900
committer Casey Schaufler <casey@schaufler-ca.com> Tue May 28 10:15:35 2013 -0700
tree d74853403421414232b56b9f0d7e61a1733c6bf9
parent e830b39412ca2bbedd7508243f21c04d57ad543c

Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()

netlbl_secattr_catmap_alloc(GFP_ATOMIC) can return NULL.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

security/smack/smack_access.c

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 53f2327..6a0377f 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -403,6 +403,8 @@
 	sap->flags |= NETLBL_SECATTR_MLS_CAT;
 	sap->attr.mls.lvl = level;
 	sap->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC);
+	if (!sap->attr.mls.cat)
+		return -ENOMEM;
 	sap->attr.mls.cat->startbit = 0;
 
 	for (cat = 1, cp = catset, byte = 0; byte < len; cp++, byte++)