2 files changed, 3 insertions, 3 deletions

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index b11ab23b328b..afa5ad0e7f72 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -923,7 +923,7 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name,
                 rc = -EPERM;
 
         if (rc == 0 && check_import) {
-                skp = smk_import_entry(value, size);
+                skp = size ? smk_import_entry(value, size) : NULL;
                 if (skp == NULL || (check_star &&
                     (skp == &smack_known_star || skp == &smack_known_web)))
                         rc = -EINVAL;
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 3c720ff10591..56a1439786a9 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -1677,7 +1677,7 @@ static ssize_t smk_write_onlycap(struct file *file, const char __user *buf,
         if (smack_onlycap != NULL && smack_onlycap != skp)
                 return -EPERM;
 
-        data = kzalloc(count, GFP_KERNEL);
+        data = kzalloc(count + 1, GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -2228,7 +2228,7 @@ static ssize_t smk_write_syslog(struct file *file, const char __user *buf,
         if (!smack_privileged(CAP_MAC_ADMIN))
                 return -EPERM;
 
-        data = kzalloc(count, GFP_KERNEL);
+        data = kzalloc(count + 1, GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;