1 files changed, 16 insertions, 11 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 63701fe0e1ad..265f33d3af9b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2032,9 +2032,9 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
         struct inode_security_struct *dsec;
         struct superblock_security_struct *sbsec;
         struct inode_security_struct *isec;
-        u32 newsid;
+        u32 newsid, clen;
         int rc;
-        char *namep, *context;
+        char *namep = NULL, *context;
 
         tsec = current->security;
         dsec = dir->i_security;
@@ -2059,17 +2059,22 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
 
         inode_security_set_sid(inode, newsid);
 
-        namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL);
-        if (!namep)
-                return -ENOMEM;
-        *name = namep;
+        if (name) {
+                namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL);
+                if (!namep)
+                        return -ENOMEM;
+                *name = namep;
+        }
 
-        rc = security_sid_to_context(newsid, &context, len);
-        if (rc) {
-                kfree(namep);
-                return rc;
+        if (value && len) {
+                rc = security_sid_to_context(newsid, &context, &clen);
+                if (rc) {
+                        kfree(namep);
+                        return rc;
+                }
+                *value = context;
+                *len = clen;
         }
-        *value = context;
 
         isec->security_attr_init = 1;