[PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[Geyslan G. Bem]

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 <geyslan@gmail.com>
---
 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

Re: [PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[Matt Fleming]

On Mon, 14 Oct, at 03:37:17PM, Geyslan G. Bem wrote:
> 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 <geyslan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  fs/efivarfs/file.c | 23 +++++++++--------------
>  1 file changed, 9 insertions(+), 14 deletions(-)

Hmm.. I'm not convinced this is much of an improvement. I think removing
'sizeof(attributes)' actually makes the code harder to read.

-- 
Matt Fleming, Intel Open Source Technology Center

Re: [PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[Geyslan Gregório Bem]

2013/10/30 Matt Fleming <matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>:
> On Mon, 14 Oct, at 03:37:17PM, Geyslan G. Bem wrote:
>> 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 <geyslan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>>  fs/efivarfs/file.c | 23 +++++++++--------------
>>  1 file changed, 9 insertions(+), 14 deletions(-)
>
> Hmm.. I'm not convinced this is much of an improvement. I think removing
> 'sizeof(attributes)' actually makes the code harder to read.
>
> --
> Matt Fleming, Intel Open Source Technology Center

Do you want that I undo that? I aggre that the variable use only
reduces the line code.

-- 
Regards,

Geyslan G. Bem
hackingbits.com

Re: [PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[Matt Fleming]

On Wed, 30 Oct, at 10:44:16AM, Geyslan Gregório Bem wrote:
> Do you want that I undo that? I aggre that the variable use only
> reduces the line code.

Yes please.

-- 
Matt Fleming, Intel Open Source Technology Center

Re: [PATCH] efivarfs: 'efivarfs_file_write' function reorganization

[Geyslan Gregório Bem]

2013/10/30 Matt Fleming <matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>:
> On Wed, 30 Oct, at 10:44:16AM, Geyslan Gregório Bem wrote:
>> Do you want that I undo that? I aggre that the variable use only
>> reduces the line code.
>
> Yes please.
>
> --
> Matt Fleming, Intel Open Source Technology Center

Done:
[PATCH v2] efivarfs: 'efivarfs_file_write' function reorganization

-- 
Regards,

Geyslan G. Bem
hackingbits.com