From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147AbbGAXFJ (ORCPT ); Wed, 1 Jul 2015 19:05:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55436 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753709AbbGAXEd (ORCPT ); Wed, 1 Jul 2015 19:04:33 -0400 Date: Thu, 2 Jul 2015 01:03:08 +0200 From: Oleg Nesterov To: Andrew Morton Cc: Benjamin LaHaise , David Rientjes , Hugh Dickins , Jeff Moyer , Kirill Shutemov , Pavel Emelyanov , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] mremap: don't do mm_populate(new_addr) on failure Message-ID: <20150701230308.GA18031@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150701230244.GA18003@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org move_vma() sets *locked even if move_page_tables() or ->mremap() fails, change sys_mremap() to check "ret & ~PAGE_MASK". I think we should simply remove the VM_LOCKED code in move_vma(), that is why this patch doesn't change move_vma(). But this needs more cleanups. Signed-off-by: Oleg Nesterov Acked-by: David Rientjes --- mm/mremap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 3310378..7dcf7b4 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -578,8 +578,10 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked); } out: - if (ret & ~PAGE_MASK) + if (ret & ~PAGE_MASK) { vm_unacct_memory(charged); + locked = 0; + } up_write(¤t->mm->mmap_sem); if (locked && new_len > old_len) mm_populate(new_addr + old_len, new_len - old_len); -- 1.5.5.1