Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / security / smack / smackfs.c

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index e249a66..6492fe9 100644 (file)
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2523,14 +2523,9 @@ static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
        if (count == 0 || count > SMK_LONGLABEL)
                return -EINVAL;
 
-       data = kzalloc(count, GFP_KERNEL);
-       if (data == NULL)
-               return -ENOMEM;
-
-       if (copy_from_user(data, buf, count) != 0) {
-               rc = -EFAULT;
-               goto out_data;
-       }
+       data = memdup_user(buf, count);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
 
        cp = smk_parse_smack(data, count);
        if (IS_ERR(cp)) {