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

BACKPORT: Minor improvement of 'smack_sb_kern_mount'

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

Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
(cherry-picked from upstream 55dfc5da1a9b7e623b6f35620c74280555df0288)
---

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 8d1932d8df64..2d93ac5f51b2 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;