2011-03-05 08:28:57

by Jovi Zhang

Subject: [PATCH 2/2] proc: fix some wrong error code usage

From: Jovi Zhang <[email protected]>

[root@wei 1]# cat /proc/1/mem
cat: /proc/1/mem: No such process

error code -ESRCH is wrong in this situation

Signed-off-by: Jovi Zhang <[email protected]>
---
fs/proc/base.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9d096e8..9c23db0 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -775,7 +775,8 @@ static ssize_t mem_read(struct file * file, char __user * buf,
if (!task)
goto out_no_task;

- if (check_mem_permission(task))
+ ret = check_mem_permission(task);
+ if (ret)
goto out;

ret = -ENOMEM;
@@ -845,7 +846,8 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
if (!task)
goto out_no_task;

- if (check_mem_permission(task))
+ copied = check_mem_permission(task);
+ if (copied)
goto out;

copied = -ENOMEM;
@@ -917,6 +919,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
if (!task)
goto out_no_task;

+ ret = -EPERM;
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out;

--
1.7.2.3

2011-03-06 11:39:09

by KOSAKI Motohiro

Subject: Re: [PATCH 2/2] proc: fix some wrong error code usage

> From: Jovi Zhang <[email protected]>
>
> [root@wei 1]# cat /proc/1/mem
> cat: /proc/1/mem: No such process
>
> error code -ESRCH is wrong in this situation
>
> Signed-off-by: Jovi Zhang <[email protected]>

Looks fine.
Reviewed-by: KOSAKI Motohiro <[email protected]>