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 S1756099AbbFRQJu (ORCPT <rfc822;w@1wt.eu>);
	Thu, 18 Jun 2015 12:09:50 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35492 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756059AbbFRQJj (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 18 Jun 2015 12:09:39 -0400
Date: Thu, 18 Jun 2015 18:08:29 +0200
From: Oleg Nesterov <oleg@redhat.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>,
        Benjamin LaHaise <bcrl@kvack.org>, Jeff Moyer <jmoyer@redhat.com>,
        linux-aio@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 0/3] aio: ctx->dead cleanups
Message-ID: <20150618160829.GA32207@redhat.com>
References: <20150616230414.GA15776@redhat.com> <20150617003906.GC17109@ZenIV.linux.org.uk> <20150617005012.GD17109@ZenIV.linux.org.uk> <20150617012245.GA22709@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150617012245.GA22709@redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 06/17, Oleg Nesterov wrote:
>
> On 06/17, Al Viro wrote:
> >
> > On Wed, Jun 17, 2015 at 01:39:06AM +0100, Al Viro wrote:
> >
> > And yes, the leak you've spotted is real, but I would very much prefer
> > to avoid that goto - something like this instead:
> >
> > diff --git a/mm/mremap.c b/mm/mremap.c
> > index 034e2d3..b36b530 100644
> > --- a/mm/mremap.c
> > +++ b/mm/mremap.c
> > @@ -291,7 +291,10 @@ static unsigned long move_vma(struct vm_area_struct *vma,
> >  		if (err < 0) {
> >  			move_page_tables(new_vma, new_addr, vma, old_addr,
> >  					 moved_len, true);
> > -			return err;
> > +			vma = new_vma;
> > +			old_len = new_len;
> > +			old_addr = new_addr;
> > +			new_addr = err;
>
> Personally, I'd really prefer to factor out at least this
> move_page_tables() with six args. Although I agree, "goto previous_if"
> doesn't look nice too, this needs cleanup.
>
> But this is minor. I am already sleeping, most probably I misread
> this code. But it seems that there is another bug with VM_ACCOUNT.
>
> I'll recheck tomorrow and write another email.

Yes this look wrong. At least we shouldn't set *locked on failure.
mm->locked_vm += new_len is probably fine, but doesn't look really
nice because ->locked_vm can underflow in do_munmap() before that.

I'll send the fixes, but also I'll try to cleanup this code. Not
sure I will succeed ;)

Oleg.