From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-f42.google.com (mail-yh0-f42.google.com [209.85.213.42]) by kanga.kvack.org (Postfix) with ESMTP id 26EC76B0031 for ; Fri, 13 Dec 2013 10:00:57 -0500 (EST) Received: by mail-yh0-f42.google.com with SMTP id z6so1574315yhz.1 for ; Fri, 13 Dec 2013 07:00:56 -0800 (PST) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTP id 41si2306943yhf.77.2013.12.13.07.00.55 for ; Fri, 13 Dec 2013 07:00:56 -0800 (PST) Date: Fri, 13 Dec 2013 09:43:20 -0500 From: Rik van Riel Subject: [PATCH -v2] mm: fix use-after-free in sys_remap_file_pages Message-ID: <20131213094320.2291c210@annuminas.surriel.com> In-Reply-To: <52AAEB19.27706.CCB8B7D@pageexec.freemail.hu> References: <20131212220757.GA14928@www.outflux.net> <20131212224118.17a951c2@annuminas.surriel.com> <52AAEB19.27706.CCB8B7D@pageexec.freemail.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: pageexec@freemail.hu Cc: Kees Cook , linux-kernel@vger.kernel.org, Andrew Morton , Michel Lespinasse , Cyrill Gorcunov , Hugh Dickins , linux-mm@kvack.org, Dmitry Vyukov On Fri, 13 Dec 2013 12:10:17 +0100 "PaX Team" wrote: > pass in vm_flags instead of vma->vm_flags just to prevent someone > from 'optimizing' away the read in the future? In that case, we should probably also use ACCESS_ONCE, if only to be explicit about it. > perhaps {copy,move} this comment above the previous hunk since that's > where the relevant action is? See the new version below: ---8<--- Subject: mm: fix use-after-free in sys_remap_file_pages remap_file_pages calls mmap_region, which may merge the VMA with other existing VMAs, and free "vma". This can lead to a use-after-free bug. Avoid the bug by remembering vm_flags before calling mmap_region, and not trying to dereference vma later. Signed-off-by: Rik van Riel Reported-by: Dmitry Vyukov Cc: stable@vger.kernel.org --- mm/fremap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/fremap.c b/mm/fremap.c index 87da359..c85e2ec 100644 --- a/mm/fremap.c +++ b/mm/fremap.c @@ -203,9 +203,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (mapping_cap_account_dirty(mapping)) { unsigned long addr; struct file *file = get_file(vma->vm_file); + /* mmap_region may free vma; grab the info now */ + vm_flags = ACCESS_ONCE(vma->vm_flags); - addr = mmap_region(file, start, size, - vma->vm_flags, pgoff); + addr = mmap_region(file, start, size, vm_flags, pgoff); fput(file); if (IS_ERR_VALUE(addr)) { err = addr; @@ -213,7 +214,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, BUG_ON(addr != start); err = 0; } - goto out; + goto out_freed; } mutex_lock(&mapping->i_mmap_mutex); flush_dcache_mmap_lock(mapping); @@ -248,6 +249,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, out: if (vma) vm_flags = vma->vm_flags; +out_freed: if (likely(!has_write_lock)) up_read(&mm->mmap_sem); else -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org