1 files changed, 3 insertions, 5 deletions

diff --git a/security/security.c b/security/security.c
index 94b35aef6871..4dc31f4f2700 100644
--- a/security/security.c
+++ b/security/security.c
@@ -348,10 +348,10 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
         if (unlikely(IS_PRIVATE(inode)))
                 return 0;
 
-        memset(new_xattrs, 0, sizeof new_xattrs);
         if (!initxattrs)
                 return security_ops->inode_init_security(inode, dir, qstr,
                                                          NULL, NULL, NULL);
+        memset(new_xattrs, 0, sizeof(new_xattrs));
         lsm_xattr = new_xattrs;
         ret = security_ops->inode_init_security(inode, dir, qstr,
                                                 &lsm_xattr->name,
@@ -366,16 +366,14 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
                 goto out;
         ret = initxattrs(inode, new_xattrs, fs_data);
 out:
-        for (xattr = new_xattrs; xattr->name != NULL; xattr++) {
-                kfree(xattr->name);
+        for (xattr = new_xattrs; xattr->value != NULL; xattr++)
                 kfree(xattr->value);
-        }
         return (ret == -EOPNOTSUPP) ? 0 : ret;
 }
 EXPORT_SYMBOL(security_inode_init_security);
 
 int security_old_inode_init_security(struct inode *inode, struct inode *dir,
-                                     const struct qstr *qstr, char **name,
+                                     const struct qstr *qstr, const char **name,
                                      void **value, size_t *len)
 {
         if (unlikely(IS_PRIVATE(inode)))