From: bookjovi@gmail.com
To: bookjovi@gmail.com
Cc: Andrew Morton <akpm@linux-foundation.org>
(commit_signer:19/51=37%),
Al Viro <viro@zeniv.linux.org.uk> (commit_signer:17/51=33%),
David Rientjes <rientjes@google.com> (commit_signer:7/51=14%),
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
(commit_signer:5/51=10%),
Stephen Wilson <wilsons@start.ca> (commit_signer:4/51=8%),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] proc: put check_mem_permission before __get_free_page in mem_read
Date: Sun, 17 Apr 2011 20:20:01 -0400 [thread overview]
Message-ID: <1303086002-6961-1-git-send-email-bookjovi@gmail.com> (raw)
From: Jovi Zhang <bookjovi@gmail.com>
It should be better if put check_mem_permission before __get_free_page
in mem_read, to be same as function mem_write.
Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
---
fs/proc/base.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/fs/proc/base.c b/fs/proc/base.c
index dfa5327..d66126d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -831,23 +831,21 @@ static ssize_t mem_read(struct file * file, char __user * buf,
if (!task)
goto out_no_task;
- ret = -ENOMEM;
- page = (char *)__get_free_page(GFP_TEMPORARY);
- if (!page)
- goto out;
-
mm = check_mem_permission(task);
ret = PTR_ERR(mm);
if (IS_ERR(mm))
- goto out_free;
+ goto out_task;
ret = -EIO;
-
if (file->private_data != (void*)((long)current->self_exec_id))
- goto out_put;
+ goto out_mm;
+
+ ret = -ENOMEM;
+ page = (char *)__get_free_page(GFP_TEMPORARY);
+ if (!page)
+ goto out_mm;
ret = 0;
-
while (count > 0) {
int this_len, retval;
@@ -870,12 +868,10 @@ static ssize_t mem_read(struct file * file, char __user * buf,
count -= retval;
}
*ppos = src;
-
-out_put:
- mmput(mm);
-out_free:
free_page((unsigned long) page);
-out:
+out_mm:
+ mmput(mm);
+out_task:
put_task_struct(task);
out_no_task:
return ret;
--
1.7.2.3
next reply other threads:[~2011-04-24 12:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-18 0:20 bookjovi [this message]
2011-04-24 15:33 ` KOSAKI Motohiro
2011-04-25 14:31 ` Stephen Wilson
2011-04-26 3:56 ` Hugh Dickins
2011-04-26 5:12 ` KOSAKI Motohiro
2011-04-26 5:50 ` [PATCH] proc: fix pagemap_read() error case (was Re: [PATCH] proc: put check_mem_permission before __get_free_page in mem_read) KOSAKI Motohiro
2011-04-26 16:44 ` Stephen Wilson
2011-04-26 20:44 ` Hugh Dickins
2011-04-28 1:45 ` KOSAKI Motohiro
2011-04-26 16:03 ` [PATCH] proc: put check_mem_permission before __get_free_page in mem_read Stephen Wilson
2011-04-26 20:19 ` Hugh Dickins
2011-04-26 8:55 ` Jovi Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303086002-6961-1-git-send-email-bookjovi@gmail.com \
--to=bookjovi@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rientjes@google.com \
--cc=viro@zeniv.linux.org.uk \
--cc=wilsons@start.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®