[PATCH] proc/base: Skip assignment to len when there is no error on d_path in do_proc_readlink.

From: Kaitao Cheng
Date: Wed May 27 2020 - 10:12:21 EST


we don't need {len = PTR_ERR(pathname)} when IS_ERR(pathname) is false,
it's better to move it into if(IS_ERR(pathname)){}.

Signed-off-by: Kaitao Cheng <pilgrimtao@xxxxxxxxx>
---
fs/proc/base.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index d86c0afc8a85..9509e0d42610 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1753,9 +1753,10 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
return -ENOMEM;

pathname = d_path(path, tmp, PAGE_SIZE);
- len = PTR_ERR(pathname);
- if (IS_ERR(pathname))
+ if (IS_ERR(pathname)) {
+ len = PTR_ERR(pathname);
goto out;
+ }
len = tmp + PAGE_SIZE - 1 - pathname;

if (len > buflen)
--
2.20.1