From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + proc-put-check_mem_permission-before-__get_free_page-in-mem_read.patch added to -mm tree Date: Mon, 25 Apr 2011 13:11:15 -0700 Message-ID: <201104252011.p3PKBFTD005857@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:44495 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903Ab1DYULX (ORCPT ); Mon, 25 Apr 2011 16:11:23 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: bookjovi@gmail.com, adobriyan@gmail.com, kosaki.motohiro@jp.fujitsu.com, wilsons@start.ca The patch titled proc: put check_mem_permission before __get_free_page in mem_read has been added to the -mm tree. Its filename is proc-put-check_mem_permission-before-__get_free_page-in-mem_read.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: proc: put check_mem_permission before __get_free_page in mem_read From: Jovi Zhang It would be better to put check_mem_permission() before __get_free_page() in mem_read(), to be same as mem_write(). Signed-off-by: Jovi Zhang Reviewed-by: KOSAKI Motohiro Reviewed-by: Stephen Wilson Cc: Alexey Dobriyan Signed-off-by: Andrew Morton --- fs/proc/base.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff -puN fs/proc/base.c~proc-put-check_mem_permission-before-__get_free_page-in-mem_read fs/proc/base.c --- a/fs/proc/base.c~proc-put-check_mem_permission-before-__get_free_page-in-mem_read +++ a/fs/proc/base.c @@ -831,23 +831,21 @@ static ssize_t mem_read(struct file * fi 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 * fi count -= retval; } *ppos = src;