On Wed, 30 Oct, at 03:57:41PM, Geyslan G. Bem wrote: > This reorganization: > > Removes useless 'bytes' prior assignment. > > Uses 'memdup_user' instead 'kmalloc' + 'copy_from_user'. > > Signed-off-by: Geyslan G. Bem <[email protected]> > --- > fs/efivarfs/file.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-)
Thanks, this is what I applied, --- >From 00ad8da13638dba692eaa58b0cba25f3f1a801b1 Mon Sep 17 00:00:00 2001 From: "Geyslan G. Bem" <[email protected]> Date: Wed, 30 Oct 2013 15:57:41 -0300 Subject: [PATCH] efivarfs: 'efivarfs_file_write' function reorganization This reorganization removes useless 'bytes' prior assignment and uses 'memdup_user' instead 'kmalloc' + 'copy_from_user'. Signed-off-by: Geyslan G. Bem <[email protected]> Signed-off-by: Matt Fleming <[email protected]> --- fs/efivarfs/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c index 8dd524f32284..cdb2971192a5 100644 --- a/fs/efivarfs/file.c +++ b/fs/efivarfs/file.c @@ -21,7 +21,7 @@ static ssize_t efivarfs_file_write(struct file *file, u32 attributes; struct inode *inode = file->f_mapping->host; unsigned long datasize = count - sizeof(attributes); - ssize_t bytes = 0; + ssize_t bytes; bool set = false; if (count < sizeof(attributes)) @@ -33,14 +33,9 @@ static ssize_t efivarfs_file_write(struct file *file, if (attributes & ~(EFI_VARIABLE_MASK)) return -EINVAL; - data = kmalloc(datasize, GFP_KERNEL); - if (!data) - return -ENOMEM; - - if (copy_from_user(data, userbuf + sizeof(attributes), datasize)) { - bytes = -EFAULT; - goto out; - } + data = memdup_user(userbuf + sizeof(attributes), datasize); + if (IS_ERR(data)) + return PTR_ERR(data); bytes = efivar_entry_set_get_size(var, attributes, &datasize, data, &set); -- 1.8.1.4 -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
