From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1756989AbdHYOkl (ORCPT <rfc822;w@1wt.eu>);
        Fri, 25 Aug 2017 10:40:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:45646 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1756685AbdHYOkj (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 25 Aug 2017 10:40:39 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7282713A53
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=oleg@redhat.com
Date: Fri, 25 Aug 2017 16:40:36 +0200
From: Oleg Nesterov <oleg@redhat.com>
To: Eric Biggers <ebiggers3@gmail.com>
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
        linux-kernel@vger.kernel.org, Dmitry Vyukov <dvyukov@google.com>,
        Ingo Molnar <mingo@kernel.org>,
        Konstantin Khlebnikov <koct9i@gmail.com>,
        Michal Hocko <mhocko@suse.com>, Peter Zijlstra <peterz@infradead.org>,
        Vlastimil Babka <vbabka@suse.cz>, stable@vger.kernel.org,
        Eric Biggers <ebiggers@google.com>
Subject: Re: [PATCH] fork: fix incorrect fput of ->exe_file causing
 use-after-free
Message-ID: <20170825144036.GA26620@redhat.com>
References: <20170823211408.31198-1-ebiggers3@gmail.com>
 <20170824132041.GA22882@redhat.com>
 <20170824165935.GA21624@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170824165935.GA21624@gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 25 Aug 2017 14:40:39 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 08/24, Eric Biggers wrote:
>
> On Thu, Aug 24, 2017 at 03:20:41PM +0200, Oleg Nesterov wrote:
> > On 08/23, Eric Biggers wrote:
> > >
> > > From: Eric Biggers <ebiggers@google.com>
> > >
> > > Commit 7c051267931a ("mm, fork: make dup_mmap wait for mmap_sem for
> > > write killable") made it possible to kill a forking task while it is
> > > waiting to acquire its ->mmap_sem for write, in dup_mmap().  However, it
> > > was overlooked that this introduced an new error path before a reference
> > > is taken on the mm_struct's ->exe_file.
> >
> > Hmm. Unless I am totally confused, the same problem with mm->exol_area?
> > I'll recheck....
>
> I'm not sure what you mean by ->exol_area.

I meant mm->uprobes_state.xol_area, sorry

> > > --- a/kernel/fork.c
> > > +++ b/kernel/fork.c
> > > @@ -806,6 +806,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p,
> > >  	mm_init_cpumask(mm);
> > >  	mm_init_aio(mm);
> > >  	mm_init_owner(mm, p);
> > > +	RCU_INIT_POINTER(mm->exe_file, NULL);
> > 
> > Can't we simply move
> > 
> > 	RCU_INIT_POINTER(mm->exe_file, get_mm_exe_file(oldmm));
> > 
> > from dup_mmap() here? Afaics this doesn't need mmap_sem.
> > 
> 
> Two problems, even assuming that get_mm_exe_file() doesn't require mmap_sem:
> 
> - If mm_alloc_pgd() or init_new_context() in mm_init() fails, mm_init() doesn't
>   do the full mmput(), so the file reference would not be dropped.  So it would
>   need to be changed to drop the file reference too.

Ah yes, I forgot that mm_init() can fail after that, thanks for correcting me.

Oleg.