From patchwork Thu Jul 21 13:13:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [maverick,maverick/ti-omap4,CVE,3/5] close race in /proc/*/environ Date: Thu, 21 Jul 2011 03:13:39 -0000 From: Andy Whitcroft X-Patchwork-Id: 106059 Message-Id: <1311254026-29719-10-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com From: Al Viro Switch to mm_for_maps(). Maybe we ought to make it r--r--r--, since we do checks on IO anyway... Signed-off-by: Al Viro (cherry picked from commit d6f64b89d7ff22ce05896ab4a93a653e8d0b123d) CVE-2011-1020 BugLink: http://bugs.launchpad.net/bugs/813026 Signed-off-by: Andy Whitcroft --- fs/proc/base.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index e60289b..1953009 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -922,20 +922,18 @@ static ssize_t environ_read(struct file *file, char __user *buf, if (!task) goto out_no_task; - if (!ptrace_may_access(task, PTRACE_MODE_READ)) - goto out; - ret = -ENOMEM; page = (char *)__get_free_page(GFP_TEMPORARY); if (!page) goto out; - ret = 0; - mm = get_task_mm(task); - if (!mm) + mm = mm_for_maps(task); + ret = PTR_ERR(mm); + if (!mm || IS_ERR(mm)) goto out_free; + ret = 0; while (count > 0) { int this_len, retval, max_len;