Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754524Ab3CKXDY (ORCPT ); Mon, 11 Mar 2013 19:03:24 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47648 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752994Ab3CKXDX (ORCPT ); Mon, 11 Mar 2013 19:03:23 -0400 Date: Mon, 11 Mar 2013 16:03:22 -0700 From: Andrew Morton To: Tommi Rantala Cc: Michel Lespinasse , Andy Lutomirski , Ingo Molnar , Al Viro , Hugh Dickins , Jorn_Engel , Rik van Riel , "linux-mm@kvack.org" , LKML , Dave Jones Subject: Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() Message-Id: <20130311160322.830cc6b670fd24faa8366413@linux-foundation.org> In-Reply-To: References: <1356050997-2688-1-git-send-email-walken@google.com> <1356050997-2688-5-git-send-email-walken@google.com> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2015 Lines: 70 On Sun, 10 Mar 2013 20:55:21 +0200 Tommi Rantala wrote: > 2012/12/21 Michel Lespinasse : > > Signed-off-by: Michel Lespinasse > > Hello, this patch introduced the following bug, seen while fuzzing with trinity: > > [ 396.825414] BUG: unable to handle kernel NULL pointer dereference > at 0000000000000050 > > ... > > > + vm_flags = vma->vm_flags; > > When find_vma() fails, vma is NULL here. Yup, thanks. This, methinks: From: Andrew Morton Subject: mm/fremap.c: fix oops on error path If find_vma() fails, sys_remap_file_pages() will dereference `vma', which contains NULL. Fix it by checking the pointer. (We could alternatively check for err==0, but this seems more direct) (The vm_flags change is to squish a bogus used-uninitialised warning without adding extra code). Reported-by: Tommi Rantala Cc: Michel Lespinasse Signed-off-by: Andrew Morton --- mm/fremap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN mm/fremap.c~mm-fremapc-fix-oops-on-error-path mm/fremap.c --- a/mm/fremap.c~mm-fremapc-fix-oops-on-error-path +++ a/mm/fremap.c @@ -163,7 +163,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsign * and that the remapped range is valid and fully within * the single existing vma. */ - if (!vma || !(vma->vm_flags & VM_SHARED)) + vm_flags = vma->vm_flags; + if (!vma || !(vm_flags & VM_SHARED)) goto out; if (!vma->vm_ops || !vma->vm_ops->remap_pages) @@ -254,7 +255,8 @@ get_write_lock: */ out: - vm_flags = vma->vm_flags; + if (vma) + vm_flags = vma->vm_flags; if (likely(!has_write_lock)) up_read(&mm->mmap_sem); else _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/