commit 55dfc5da1a9b7e623b6f35620c74280555df0288
author José Bollo <jose.bollo@open.eurogiciel.org> Wed Jan 08 15:53:05 2014 +0100
committer Casey Schaufler <casey@schaufler-ca.com> Fri Apr 11 14:33:59 2014 -0700
tree 684c885270fdf52de7639aba8ebcc4dd86836b96
parent f64410ec665479d7b4b77b7519e814253ed0f686

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>

security/smack/smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index d814e35..efa4299 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -413,9 +413,11 @@
 	 * 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;