Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754829AbbKLPRJ (ORCPT ); Thu, 12 Nov 2015 10:17:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49706 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754494AbbKLPRH (ORCPT ); Thu, 12 Nov 2015 10:17:07 -0500 From: "Jerome Marchand" To: linux-mm@kvack.org, Andrey Ryabinin Cc: linux-kernel@vger.kernel.org Subject: [PATCH] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() Date: Thu, 12 Nov 2015 16:17:04 +0100 Message-Id: <1447341424-11466-1-git-send-email-jmarchan@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1044 Lines: 32 Commit 71394fe50146 ("mm: vmalloc: add flag preventing guard hole allocation") missed a spot. Currently remove_vm_area() decreases vm->size to remove the guard hole page, even when it isn't present. This patch only decreases vm->size when VM_NO_GUARD isn't set. Signed-off-by: Jerome Marchand --- mm/vmalloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d045634..1388c3d 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1443,7 +1443,8 @@ struct vm_struct *remove_vm_area(const void *addr) vmap_debug_free_range(va->va_start, va->va_end); kasan_free_shadow(vm); free_unmap_vmap_area(va); - vm->size -= PAGE_SIZE; + if (!(vm->flags & VM_NO_GUARD)) + vm->size -= PAGE_SIZE; return vm; } -- 2.4.3 -- 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/