summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2013-05-27 20:11:27 +0900
committerChanho Park <chanho61.park@samsung.com>2014-03-20 17:42:25 +0900
commit44c6037148a9faa91633c7c9fbbabbaa59c3dec3 (patch)
tree072d500535ca7555afb3e677589aa9f354d62371 /security
parent3e66398ac01f27e47bfcead8b9882178b6ed3ad8 (diff)
downloadlinux-3.10-44c6037148a9faa91633c7c9fbbabbaa59c3dec3.tar.gz
linux-3.10-44c6037148a9faa91633c7c9fbbabbaa59c3dec3.tar.bz2
linux-3.10-44c6037148a9faa91633c7c9fbbabbaa59c3dec3.zip
Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()
netlbl_secattr_catmap_alloc(GFP_ATOMIC) can return NULL. Change-Id: Id67f7f66a61a05e7e45b66a50b5d0869ef7e5117 Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Ɓukasz Stelmach <l.stelmach@samsung.com>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_access.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 53f2327a592..6a0377f3862 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -403,6 +403,8 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap,
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++)