mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] proc: put check_mem_permission before __get_free_page in mem_read
@ 2011-04-18  0:20 bookjovi
  2011-04-24 15:33 ` KOSAKI Motohiro
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: bookjovi @ 2011-04-18  0:20 UTC (permalink / raw)
  To: bookjovi
  Cc: Andrew Morton, Al Viro, David Rientjes, KOSAKI Motohiro,
	Stephen Wilson, open list

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


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2011-04-28  1:45 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-18  0:20 [PATCH] proc: put check_mem_permission before __get_free_page in mem_read bookjovi
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

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®