2016-11-11 09:04:55

by Sachin Shukla

[permalink] [raw]
Subject: [PATCH] Fs: Improvement in code readability when memdup_user()fails.

From: "Sachin Shukla"<[email protected])>

There is no need to call kfree() if memdup_user() fails, as no memory
was allocated and the error in the error-valued pointer should be returned.

Signed-off-by: Sachin Shukla <[email protected]>
---
fs/ioctl.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/ioctl.c b/fs/ioctl.c
index c415668..1103c5d 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -588,11 +588,8 @@ static int ioctl_file_dedupe_range(struct file *file, void __user *arg)
}

same = memdup_user(argp, size);
- if (IS_ERR(same)) {
- ret = PTR_ERR(same);
- same = NULL;
- goto out;
- }
+ if (IS_ERR(same))
+ return PTR_ERR(same);

same->dest_count = count;
ret = vfs_dedupe_file_range(file, same);
--
1.7.9.5