1 files changed, 20 insertions, 18 deletions

diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 0c72c9c38956..3674a52e1cfb 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -243,32 +243,34 @@ static const struct file_operations ima_ascii_measurements_ops = {
 static ssize_t ima_write_policy(struct file *file, const char __user *buf,
                                 size_t datalen, loff_t *ppos)
 {
-        char *data;
-        int rc;
+        char *data = NULL;
+        ssize_t result;
 
         if (datalen >= PAGE_SIZE)
-                return -ENOMEM;
-        if (*ppos != 0) {
-                /* No partial writes. */
-                return -EINVAL;
-        }
+                datalen = PAGE_SIZE - 1;
+
+        /* No partial writes. */
+        result = -EINVAL;
+        if (*ppos != 0)
+                goto out;
+
+        result = -ENOMEM;
         data = kmalloc(datalen + 1, GFP_KERNEL);
         if (!data)
-                return -ENOMEM;
+                goto out;
 
-        if (copy_from_user(data, buf, datalen)) {
-                kfree(data);
-                return -EFAULT;
-        }
         *(data + datalen) = '\0';
-        rc = ima_parse_add_rule(data);
-        if (rc < 0) {
-                datalen = -EINVAL;
-                valid_policy = 0;
-        }
 
+        result = -EFAULT;
+        if (copy_from_user(data, buf, datalen))
+                goto out;
+
+        result = ima_parse_add_rule(data);
+out:
+        if (result < 0)
+                valid_policy = 0;
         kfree(data);
-        return datalen;
+        return result;
 }
 
 static struct dentry *ima_dir;