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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 4F587C388F7 for ; Thu, 22 Oct 2020 13:20:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CC97B222E9 for ; Thu, 22 Oct 2020 13:20:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="tWtwnKyn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC97B222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 530F86B00A1; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E16B6B00A2; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3879A6B00A3; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0239.hostedemail.com [216.40.44.239]) by kanga.kvack.org (Postfix) with ESMTP id 00DE36B00A1 for ; Thu, 22 Oct 2020 09:20:06 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 86BF08995502 for ; Thu, 22 Oct 2020 13:20:06 +0000 (UTC) X-FDA: 77399619612.24.cover48_00154ee27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 64D8A1A4A0 for ; Thu, 22 Oct 2020 13:20:06 +0000 (UTC) X-HE-Tag: cover48_00154ee27251 X-Filterd-Recvd-Size: 4692 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:05 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id s8so988481qvv.18 for ; Thu, 22 Oct 2020 06:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=82GpDRN2bzlSEUUIs0zjPg3hV7sJu2/XktKPfbK22J8=; b=tWtwnKynPkzSOrG+zSy5kc/FMphMTKm2dq/9iFU7e1/dkaF/2JuWYdipjcobDjyBwy wIQC4feJr5dILPBZ3dRT/nrzycw6f57z1xZloihNJ3+gK7ipusk77GKQhcI3aKBQ2ZSR N/1r26kJcMOOQd2aXSW9ltDFysrTwSD0D7KAuzJ0nLq304E7w7cf++Vt7iYZclqE2hra w23JnppKE3gOCzKNb8lOXAgrDXBnu984Jp8yxvgvA9MRE1Xzc8XPn00MqRBYydbd/Vvf nMS4+plzVke/OgKnlh9IgvUUOrfSISvb3eiI+QxNns8PEhwTX5Dsqtizd/LGoNYa9mnt M3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=82GpDRN2bzlSEUUIs0zjPg3hV7sJu2/XktKPfbK22J8=; b=lVjubrt4A+zqvQY6u9aQkdCbN+dgThfxM/718QKGQKtOEduV7q+okF62iwSkXkdhMF O1LhqSAh3NlQ1kRwoCIeyWDnESleGV4y3E9IJbdwTtIAL6y5R8SfO85Y3ArUBILcyCDK sHBEGWP9M9DgNj7tK5zueX5wX4iMTUv4q6Dij6tDYLySgZK9PQSBOcWVCObk1r7M0l+z SmSZG2elIy7kedtChLfAq6RS5yJrmn+PQIkTjixmPckeF4DPLDIPqUMz5um9yUFvPGnL yfhs6Jq0sL7kj2ewt6ukJ0nSsgnJBQmozuJXviVL3Hi1vGuD2XAgGNPlfyIxYbzkxtIy k3BA== X-Gm-Message-State: AOAM533/GGGby8gzrcOJy9dHKLaOP8S3ZHv9B0xi5iT4oltNsFQJjls7 Ye/ZibjKWRTOI+ikhDbe5+FOomLwNMj/ZQMS X-Google-Smtp-Source: ABdhPJzTohZHh5HournX+riNqfWMMNH1faYgSuMJ/kor6Kn86pEMP35j+/Fvz9Ycg0Qh5XDdJzsdAhfctEmFzy3g X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4ba8:: with SMTP id i8mr2334507qvw.59.1603372805117; Thu, 22 Oct 2020 06:20:05 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:09 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 17/21] kasan: simplify kasan_poison_kfree From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: kasan_poison_kfree() is currently only called for mempool allocations that are backed by either kmem_cache_alloc() or kmalloc(). Therefore, the page passed to kasan_poison_kfree() is always PageSlab() and there's no need to do the check. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/If31f88726745da8744c6bea96fb32584e6c2778c --- mm/kasan/common.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a581937c2a44..b82dbae0c5d6 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -441,16 +441,7 @@ void __kasan_poison_kfree(void *ptr, unsigned long ip) struct page *page; page = virt_to_head_page(ptr); - - if (unlikely(!PageSlab(page))) { - if (ptr != page_address(page)) { - kasan_report_invalid_free(ptr, ip); - return; - } - kasan_poison_memory(ptr, page_size(page), KASAN_FREE_PAGE); - } else { - ____kasan_slab_free(page->slab_cache, ptr, ip, false); - } + ____kasan_slab_free(page->slab_cache, ptr, ip, false); } void __kasan_kfree_large(void *ptr, unsigned long ip) -- 2.29.0.rc1.297.gfa9743e501-goog