This reorganization: Adds 'attrsize' variable to make the code cleaner and more understandable, replacing all 'sizeof(attributes)'.
Removes 'bytes' prior assignment due this new approach. Uses 'memdup_user' instead 'kmalloc' + 'copy_from_user'. Signed-off-by: Geyslan G. Bem <[email protected]> --- fs/efivarfs/file.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c index 8dd524f..e190aa0 100644 --- a/fs/efivarfs/file.c +++ b/fs/efivarfs/file.c @@ -18,29 +18,24 @@ static ssize_t efivarfs_file_write(struct file *file, { struct efivar_entry *var = file->private_data; void *data; - u32 attributes; + u32 attributes, attrsize = sizeof(attributes); struct inode *inode = file->f_mapping->host; - unsigned long datasize = count - sizeof(attributes); - ssize_t bytes = 0; + unsigned long datasize = count - attrsize; + ssize_t bytes; bool set = false; - if (count < sizeof(attributes)) + if (count < attrsize) return -EINVAL; - if (copy_from_user(&attributes, userbuf, sizeof(attributes))) + if (copy_from_user(&attributes, userbuf, attrsize)) return -EFAULT; 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 + attrsize, datasize); + if (IS_ERR(data)) + return PTR_ERR(data); bytes = efivar_entry_set_get_size(var, attributes, &datasize, data, &set); @@ -56,7 +51,7 @@ static ssize_t efivarfs_file_write(struct file *file, dput(file->f_dentry); } else { mutex_lock(&inode->i_mutex); - i_size_write(inode, datasize + sizeof(attributes)); + i_size_write(inode, datasize + attrsize); mutex_unlock(&inode->i_mutex); } -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
