From patchwork Tue Feb 28 09:33:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 6966 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 925A623E01 for ; Tue, 28 Feb 2012 09:32:50 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 46E12A187E9 for ; Tue, 28 Feb 2012 09:32:50 +0000 (UTC) Received: by iage36 with SMTP id e36so945673iag.11 for ; Tue, 28 Feb 2012 01:32:49 -0800 (PST) Received: from mr.google.com ([10.50.170.41]) by 10.50.170.41 with SMTP id aj9mr21750814igc.0.1330421569743 (num_hops = 1); Tue, 28 Feb 2012 01:32:49 -0800 (PST) Received: by 10.50.170.41 with SMTP id aj9mr17610505igc.0.1330421569701; Tue, 28 Feb 2012 01:32:49 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp4180ibr; Tue, 28 Feb 2012 01:32:48 -0800 (PST) Received: by 10.204.156.129 with SMTP id x1mr7187738bkw.72.1330421567866; Tue, 28 Feb 2012 01:32:47 -0800 (PST) Received: from mail-bk0-f50.google.com (mail-bk0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id ua1si9698056bkb.62.2012.02.28.01.32.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 01:32:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of dmitry.antipov@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of dmitry.antipov@linaro.org) smtp.mail=dmitry.antipov@linaro.org Received: by bkuw11 with SMTP id w11so2057177bku.37 for ; Tue, 28 Feb 2012 01:32:47 -0800 (PST) Received-SPF: pass (google.com: domain of dmitry.antipov@linaro.org designates 10.204.133.195 as permitted sender) client-ip=10.204.133.195; Received: from mr.google.com ([10.204.133.195]) by 10.204.133.195 with SMTP id g3mr4614222bkt.73.1330421567258 (num_hops = 1); Tue, 28 Feb 2012 01:32:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.204.133.195 with SMTP id g3mr3684525bkt.73.1330421567058; Tue, 28 Feb 2012 01:32:47 -0800 (PST) Received: from localhost.localdomain ([78.153.153.8]) by mx.google.com with ESMTPS id u8sm29800470bkg.13.2012.02.28.01.32.45 (version=SSLv3 cipher=OTHER); Tue, 28 Feb 2012 01:32:46 -0800 (PST) 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 X-Gm-Message-State: ALoCoQlujrYZcpDSFOyMMoXJswM4Vft4zFAduAi0fLaJfFg950/KmZ3lBmjVIdXBaFlBDRqjwsTV - 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,