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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 B2604C64E8A for ; Mon, 23 Nov 2020 20:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68C582074B for ; Mon, 23 Nov 2020 20:15:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="K9aATwYZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387462AbgKWUPb (ORCPT ); Mon, 23 Nov 2020 15:15:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731771AbgKWUP3 (ORCPT ); Mon, 23 Nov 2020 15:15:29 -0500 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1387AC0613CF for ; Mon, 23 Nov 2020 12:15:28 -0800 (PST) Received: by mail-wm1-x34a.google.com with SMTP id y21so106628wma.6 for ; Mon, 23 Nov 2020 12:15:28 -0800 (PST) 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=FZtWTAUkAvRQTA+AtFREJR6Qo+0tQ7KPae8j2grwXDU=; b=K9aATwYZ9UoO7zi/mRajdIf64nFoB/xPUhE6qD8yIYqaNAhTqY64x7uB+K9m3QJ40A ytw4vCig7iAtvBjCXfs40hqcTLm7Odl0kKeDucZE+W5LxAe8giB5ELA+GiXmWkoyVfTR 8VWXey3Y9t3qeFOVBmJkyXECHO8rV15eIPpddIiFLLU/qlDLV5HqtrwPJh0+UH2Ygph5 Z6/bnnanhSfmK5redsl/WVUEpIGIXuFJacmnkiW+gJbrNQFApiGz7xK8SCrztmwn+Cvh vx+a8m9boaO+qlJC/KyajQBs38ioorzXUmsspg2Z4ytFIwtAzknXZ1YxVcYgrBWWv60L fiZQ== 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=FZtWTAUkAvRQTA+AtFREJR6Qo+0tQ7KPae8j2grwXDU=; b=Mmb2wODT0ptb43v1VVYcnhd8AsD/qQEmHiIHmumeLBxCh8/bz0kw2w5OB/zxupt+/A 7lnzmji0MDERWUPXRmT5tcXjFJBHbEWLjyJ0Wz2O/0TY3nkYKJjt5jtk+UdaqYu+cRV1 i1GQefqaN/eyxWitK6W5rJg31PNaKLh83P/LPGP7yIpRDAQuc4OoARjGokB3H3t/NFKp 7n+wYD8yIDeUUvo68tC8iWFiSoThI/aP8kHKzpy/qveYDCM9rIrDN4jP2FZPAEUHKp8p blWCBYR5WrvgKYpv56OETtjQdnVEO8MKrl+iYtz9iGmHDP7n/6tKAfwXzMXupy2rNHl6 AmtA== X-Gm-Message-State: AOAM532mmMkBb7uP71dpjBNx52llbDS79Nl0Sf47o+bEDdCBXAnTyO09 qvt94LLsSrf8xsLgeJBmrTvCG7kPTxrteIsk X-Google-Smtp-Source: ABdhPJx1M4yjerM84Av5uMxcUmZm/oWpySCuetBAnvpXA3hwdyiT7m0HNDW+S1RL2PjXZJhTMRp0/KP7cR2W8hs1 Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:ed02:: with SMTP id a2mr1480549wro.81.1606162526631; Mon, 23 Nov 2020 12:15:26 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:44 +0100 In-Reply-To: Message-Id: <47b232474f1f89dc072aeda0fa58daa6efade377.1606162397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 14/19] kasan: don't round_up too much From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For hardware tag-based mode kasan_poison_memory() already rounds up the size. Do the same for software modes and remove round_up() from the common code. Signed-off-by: Andrey Konovalov Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver 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 1205faac90bd..1a88e4005181 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -214,9 +214,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object) void __kasan_poison_object_data(struct kmem_cache *cache, void *object) { - poison_range(object, - round_up(cache->object_size, KASAN_GRANULE_SIZE), - KASAN_KMALLOC_REDZONE); + poison_range(object, cache->object_size, KASAN_KMALLOC_REDZONE); } /* @@ -289,7 +287,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; @@ -313,8 +310,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); - poison_range(object, rounded_up_size, KASAN_KMALLOC_FREE); + poison_range(object, cache->object_size, KASAN_KMALLOC_FREE); if (!kasan_stack_collection_enabled()) return false; diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index 37153bd1c126..e9efe88f7679 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -83,6 +83,7 @@ void poison_range(const void *address, size_t size, u8 value) * addresses to this function. */ address = kasan_reset_tag(address); + size = round_up(size, KASAN_GRANULE_SIZE); /* Skip KFENCE memory if called explicitly outside of sl*b. */ if (is_kfence_address(address)) -- 2.29.2.454.gaff20da3a2-goog