From: José Bollo <jose.bollo@open.eurogiciel.org>
Date: Wed, 8 Jan 2014 14:53:05 +0000 (+0100)
Subject: Minor improvement of 'smack_sb_kern_mount'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d2724a3b7e348b2e2de0bbcdc147d0cd190a35f;p=platform%2Fkernel%2Flinux-stable.git

Minor improvement of 'smack_sb_kern_mount'

Fix a possible memory access fault when transmute is true and isp is NULL.

Change-Id: I29708ce54b96b34b440cf349e2b1891ea8d9d34f
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
---

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index c972a71c8d7f..816e785bf51b 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -413,9 +413,11 @@ static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
 	 * Initialize the root inode.
 	 */
 	isp = inode->i_security;
-	if (inode->i_security == NULL) {
-		inode->i_security = new_inode_smack(sp->smk_root);
-		isp = inode->i_security;
+	if (isp == NULL) {
+		isp = new_inode_smack(sp->smk_root);
+		if (isp == NULL)
+			return -ENOMEM;
+		inode->i_security = isp;
 	} else
 		isp->smk_inode = sp->smk_root;