Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932595Ab2B1Jcu (ORCPT ); Tue, 28 Feb 2012 04:32:50 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:35632 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932308Ab2B1Jcs (ORCPT ); Tue, 28 Feb 2012 04:32:48 -0500 Authentication-Results: mr.google.com; spf=pass (google.com: domain of dmitry.antipov@linaro.org designates 10.204.133.195 as permitted sender) smtp.mail=dmitry.antipov@linaro.org MIME-Version: 1.0 From: Dmitry Antipov To: Rusty Russell , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linaro-dev@lists.linaro.org, patches@linaro.org, Dmitry Antipov Subject: [PATCH 1/2] vmalloc: use ZERO_SIZE_PTR / ZERO_OR_NULL_PTR Date: Tue, 28 Feb 2012 13:33:59 +0400 Message-Id: <1330421640-5137-1-git-send-email-dmitry.antipov@linaro.org> X-Mailer: git-send-email 1.7.7.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1644 Lines: 54 - Fix vmap() to return ZERO_SIZE_PTR if 0 pages are requested; - fix __vmalloc_node_range() to return ZERO_SIZE_PTR if 0 bytes are requested; - fix __vunmap() to check passed pointer with ZERO_OR_NULL_PTR. Signed-off-by: Dmitry Antipov --- mm/vmalloc.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 86ce9a5..040a9cd 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1456,7 +1456,7 @@ static void __vunmap(const void *addr, int deallocate_pages) { struct vm_struct *area; - if (!addr) + if (unlikely(ZERO_OR_NULL_PTR(addr))) return; if ((PAGE_SIZE-1) & (unsigned long)addr) { @@ -1548,7 +1548,9 @@ void *vmap(struct page **pages, unsigned int count, might_sleep(); - if (count > totalram_pages) + if (unlikely(!count)) + return ZERO_SIZE_PTR; + if (unlikely(count > totalram_pages)) return NULL; area = get_vm_area_caller((count << PAGE_SHIFT), flags, @@ -1648,8 +1650,10 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, void *addr; unsigned long real_size = size; + if (unlikely(!size)) + return ZERO_SIZE_PTR; size = PAGE_ALIGN(size); - if (!size || (size >> PAGE_SHIFT) > totalram_pages) + if (unlikely((size >> PAGE_SHIFT) > totalram_pages)) goto fail; area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, -- 1.7.7.6 -- 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/