From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB79CC4346E for ; Sun, 27 Sep 2020 16:33:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 28157221EC for ; Sun, 27 Sep 2020 16:33:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="iD/Q03s9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28157221EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 697C06B005C; Sun, 27 Sep 2020 12:33:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 622498E0001; Sun, 27 Sep 2020 12:33:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5378F6B0068; Sun, 27 Sep 2020 12:33:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0075.hostedemail.com [216.40.44.75]) by kanga.kvack.org (Postfix) with ESMTP id 3F2956B005C for ; Sun, 27 Sep 2020 12:33:43 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F095D483C for ; Sun, 27 Sep 2020 16:33:42 +0000 (UTC) X-FDA: 77309387484.04.pet32_0d093c82717a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id D0ADF800CD0C for ; Sun, 27 Sep 2020 16:33:42 +0000 (UTC) X-HE-Tag: pet32_0d093c82717a X-Filterd-Recvd-Size: 2320 Received: from m12-13.163.com (m12-13.163.com [220.181.12.13]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Sun, 27 Sep 2020 16:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=dHBuV XudridnxqfNWPNN2oRSCii+hG0OIcSEYu/iFZ8=; b=iD/Q03s9Nsc7CIP50bSdo 1Rt0h/tdYxFRl+3bxG1ZLTBrU1aeYnjOasTI6my51QbjVggf+LXuSrzyJ0VAZ6X3 Mu2ootQbbvYjIIs5fyu7nwBzHDROi6EI5JK3s2YmlJiAQs4uTp2xsgjUTzwObCLh rZ5n9pMljmyQQ32wz6gZ5M= Received: from localhost (unknown [101.86.214.224]) by smtp9 (Coremail) with SMTP id DcCowABXpyvhvnBfM8AxIg--.47504S2; Mon, 28 Sep 2020 00:33:37 +0800 (CST) Date: Mon, 28 Sep 2020 00:33:37 +0800 From: Hui Su To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/vmalloc.c: check the addr first Message-ID: <20200927163337.GA5472@rlk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CM-TRANSID:DcCowABXpyvhvnBfM8AxIg--.47504S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFWDWr43tF47uw4UWw47twb_yoW3trg_Ca sFkr1UXrWDJanrK3W29rs0vry7KFW0y3s29F13ta93Jry8GFWfGasrXr95JrW8WrW3XF9r W39rZFWxJrnxJjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5GPfPUUUUU== X-Originating-IP: [101.86.214.224] X-CM-SenderInfo: xvkbvvri6rljoofrz/xtbBDgGsX1rbKaQU4AAAsE X-Bogosity: Ham, tests=bogofilter, spamicity=0.179016, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: As the comments said, if @addr is NULL, no operation is performed, check the addr first in vfree() and vfree_atomic() maybe a better choice. Signed-off-by: Hui Su --- mm/vmalloc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index be4724b916b3..1cf50749a209 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2305,10 +2305,11 @@ void vfree_atomic(const void *addr) { BUG_ON(in_nmi()); - kmemleak_free(addr); - if (!addr) return; + + kmemleak_free(addr); + __vfree_deferred(addr); } @@ -2340,13 +2341,13 @@ void vfree(const void *addr) { BUG_ON(in_nmi()); + if (!addr) + return; + kmemleak_free(addr); might_sleep_if(!in_interrupt()); - if (!addr) - return; - __vfree(addr); } EXPORT_SYMBOL(vfree); -- 2.25.1