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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 5AE5FC388F2 for ; Thu, 22 Oct 2020 13:39:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E69420790 for ; Thu, 22 Oct 2020 13:39:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GaIMUpdb"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="wLfqjA4J"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ChsOlRrZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E69420790 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=V+RHcby3bBVAYZR1JFgdoE8sKCctnK9iYpmsRZiQ2FU=; b=GaIMUpdbwPuTlea0Bx/JFMC+e XG094YVKuvu/Vi3Fth5KxuPkLLOpSec186Rln22TvjLepYOLLHNMy41akQ0OQ/VPx0DogX2jWUX32 9Krl9p7ihaEZtY429pZgCFs7vzlBqfo6lx0oj8bbbctW5faQDdA7UxVdC8Tl3pWOUkNmnhGQaJVLD RaqSxDPXk5jzTVGdzUBrwgGBsKNaz/CxX1FdJm6s36smnUjwGXWD7Fl7ILC9wAMtRQPtWOG+rSEk3 ku0X4Ld+TwsjMS6XEUGtfBRmgz5OEji2xmbCtcRq1AB4vmuk9ZDv3/PdFPhnxW9YYi7H47IrccJ5I V1+TUcJVw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVamQ-0001n0-2l; Thu, 22 Oct 2020 13:37:22 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVamK-0001j7-7d for linux-arm-kernel@merlin.infradead.org; Thu, 22 Oct 2020 13:37:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=YuCr19yY32x7rWFAvs+3N7JOh1jAyp/iY7KfCFpXvOQ=; b=wLfqjA4JqqFZgBZaQzsTZqKH2D 0jTY87AXPkaalF6HsN3QRqUrjZY3aZfy6wXeskQum0NhxFZr5mTEd2wATQzcZaCR9oC68i+iGVzT+ ZBtIDHDJQtUXfgkdXxPSrSx0+AwCpHDOWALJcA4n2tL06OU0gF93RByWd9HXy2AzSh8HiS7oTZznX 3Gdg3ZMcI0Twl8QpUqSZsS8vWBwcE5QnVqhUWutH0SRSCwu6hb5ibGh9gkYHF2Eg12rC7EYEjfUNW J8ZXfZmWzroK9zDGvk+/KUMfvCta4pBmMjxCAHMvohfQIFjtwlygL4dXgK2bokfB7IZ3b+JH9/Umw SOxfhzQg==; Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVn-0006Ls-9t for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 13:20:14 +0000 Received: by mail-wr1-x449.google.com with SMTP id v5so628582wrr.0 for ; Thu, 22 Oct 2020 06:20:10 -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=YuCr19yY32x7rWFAvs+3N7JOh1jAyp/iY7KfCFpXvOQ=; b=ChsOlRrZcpMoNGFYVgPoeVQg4Og5D+L7BbXiRVwpiZdViVq24qE3ZXqD3tQKH1FVJ7 HPd8FiV4pgtZUpYsxjl4hjAI/chk6N6P7ZOwFJUSMDGqaZlGN3Hx2rCtgiR2Spdsr11A 3RijHVED0ZEakIzCCu8/+3wIW9zFSUQ1BdGEpmQt/saJo1CR2tEUDMT1zxXdSJBvnLiS 5+2dw/bqnsJNllMA9jtkCYiE9XPytCZ2yg+rSNEse1oRsbObLdRtoFTJYWV+BND/RPsk pbKBGe+3Ar4H6vvSgqCb8RcHo/nToy4mNwHFBvnAXbW5hdwoTVk4JYy0UyQMOuTBOAbB 3krg== 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=YuCr19yY32x7rWFAvs+3N7JOh1jAyp/iY7KfCFpXvOQ=; b=MSOddsNVAQ0aNQbGels28sgO2BQZAQPOarXro4ROs+TPuSnS/oWCqtsxwD+8Pn70dG eQJigECZAyBaj03UW1N60HyJH75BROC+CAyjbrpG+p1+oaRmnqDNrI/StdPEes4wGvIJ gGRkXsUmyVzEyAQQR1LYc4FEuWO71QE/4bhcWufd/i46vjyzG0/lU7k2HiYTH5V77myp 2+GW++h6jiG/BPQOR0xyGHU6NJjjiR/GMbCgI6Phzam8TrxBd7gvDTaMfjSo6Th11ZXM tF4q4VJRr/7U51iyiEhfgrVyf1qeQGB/+nFRsOVuSkSS7wy/6ksVUt7y6NbckII3uO36 X56Q== X-Gm-Message-State: AOAM530Fjzbs4AiJXgQCNCh1OTFOkNswiG9mu+2mq6Ku35/nG5Pj4kV5 1qt4XNqAlRHcMoCSYW55YgXlz4fpfAvqd9Oh X-Google-Smtp-Source: ABdhPJwWNBYBHEv7lNZy893nJ+RAAVNZlsa6c03VHyI91VlaLfFFNpC5caS3U7BZ/Z95iIq4PIHypm2N0XWIka41 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a7b:c04a:: with SMTP id u10mr2667777wmc.83.1603372809904; Thu, 22 Oct 2020 06:20:09 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:11 +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 19/21] kasan: don't round_up too much From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201022_142011_747998_0806098B X-CRM114-Status: GOOD ( 13.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Branislav Rankov , Elena Petrova , linux-mm@kvack.org, Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Kostya Serebryany , linux-arm-kernel@lists.infradead.org, Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Peter Collingbourne , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org For tag-based mode kasan_poison_memory() already rounds up the size. Do the same for software modes and remove round_up() from common code. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ib397128fac6eba874008662b4964d65352db4aa4 --- mm/kasan/common.c | 8 ++------ mm/kasan/shadow.c | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 5622b0ec0907..983383ebe32a 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -215,9 +215,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object) void __kasan_poison_object_data(struct kmem_cache *cache, void *object) { - kasan_poison_memory(object, - round_up(cache->object_size, KASAN_GRANULE_SIZE), - KASAN_KMALLOC_REDZONE); + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_REDZONE); } /* @@ -290,7 +288,6 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, { u8 tag; void *tagged_object; - unsigned long rounded_up_size; tag = get_tag(object); tagged_object = object; @@ -311,8 +308,7 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, return true; } - rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE); - kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE); + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_FREE); if (static_branch_unlikely(&kasan_stack)) { if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) || diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index 616ac64c4a21..ab1d39c566b9 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -82,6 +82,7 @@ void kasan_poison_memory(const void *address, size_t size, u8 value) * addresses to this function. */ address = reset_tag(address); + size = round_up(size, KASAN_GRANULE_SIZE); shadow_start = kasan_mem_to_shadow(address); shadow_end = kasan_mem_to_shadow(address + size); -- 2.29.0.rc1.297.gfa9743e501-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel