From patchwork Fri Nov 13 22:20:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11904983 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 057F6697 for ; Fri, 13 Nov 2020 22:20:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BEC9C206F9 for ; Fri, 13 Nov 2020 22:20:52 +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="feWIg6qU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEC9C206F9 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 0BF986B0098; Fri, 13 Nov 2020 17:20:51 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E765E6B009A; Fri, 13 Nov 2020 17:20:50 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2A286B009B; Fri, 13 Nov 2020 17:20:50 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 84FC56B0098 for ; Fri, 13 Nov 2020 17:20:50 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2E8B0181AEF07 for ; Fri, 13 Nov 2020 22:20:50 +0000 (UTC) X-FDA: 77480815860.19.smell99_2010bef27312 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 0266F1AD1B2 for ; Fri, 13 Nov 2020 22:20:49 +0000 (UTC) X-Spam-Summary: 1,0,0,bae82d3b64883301,d41d8cd98f00b204,3waavxwokci0r4u8vf14c2x55x2v.t532z4be-331crt1.58x@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:968:973:988:989:1042:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3866:3867:3868:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4385:4425:5007:6261:6653:6742:7901:8603:9025:9969:10004:10400:10429:10430:10431:11026:11232:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:14096:14097:14181:14394:14659:14721:19903:19997:21080:21365:21444:21451:21627:21772:21939:21990:30003:30012:30054,0,RBL:209.85.219.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yrc3n65qsrpr8kjpknkcs4krh5zypu5youp1fep1zgq93e7dn74xjicxxd5pe.yn9ueqehy8eydpr6istd97me16pzyx1 akisinub X-HE-Tag: smell99_2010bef27312 X-Filterd-Recvd-Size: 5444 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 22:20:49 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id dp12so1224873qvb.2 for ; Fri, 13 Nov 2020 14:20:49 -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=WUG0j444ZBT4A3BTzNH/LM6507YxULafwrr/Sriwg0c=; b=feWIg6qUi7heyfOTSzsy2DpmrO1Qia8xbqIt8JmH5daMnreAv2krFvZcHiqDVKaKv2 1bTiAzutYZP/XiwiZ9rIvAKvtPkQ7Mc6tpkK9c/r6TsmzWPVn8WIrC7+uJ4GTVzK1zmW TARqSwftqGvkqjdh+M4+ZJqYCDPFDqsDB9jR8vkc90/AV5vWJuhIxDotwDlEkh3jH5qe ZmaI6Rzzwp10/w7Ry/ZUbxCMitP2uLv4cyOpLyoScAlq9lSOFBT/gO1S6XhYs7/32ijH 6yjUGd/6BuFXadoaZ8NaAhKvRf9nKcM6diCCz9JjlSN3ZDQG/jWv6oy7qyJYGVlmyAkl JszA== 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=WUG0j444ZBT4A3BTzNH/LM6507YxULafwrr/Sriwg0c=; b=HrsF3OZBP79yGqfV/69n5ql0+d54thEHH3UHx8HAmQhZx87fccTIo9wN7Hd5LfVgne Q0MfAezi/62jGEjkJEJnztChUNhh2WG13L26H3s4y7NtQAFWdYXyxhkmr4x/qytmGLWy EJmLJq+DT+3+2ov2TRhx3XNWdr01qWxpLY2QQVJ3G/wybs0ThzWI29Jg0L2vWorLx2pz 3PQBqYX82X0mZ0PDI9jhweq82SaN3oIbJOM564/dnG/Z4B6ZDI2r/JFlNH9G01LaLtCO GiU93G6n+tHZZr6PbXeLDlY82TKtKbvzhc+URHUKcC0cS/OCnVvrCzSQ48AhKt1P9dwe e0Hw== X-Gm-Message-State: AOAM5326c1OOdz+nHib7+tOij4KRaCAm+LwlL/jbSE7P8lra7QEO4Bvu aApJWa8lPORx4yx2GdDcKHfjPBtB6sC3nmtK X-Google-Smtp-Source: ABdhPJyDbEDKFY3EfcHLc7j3mQfHgxDyZ09bJBO/2bzJnR89c+WsxkzTNbHHqzArwf4wHZ9mwaSRm4uyurfObZ/0 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:d43:: with SMTP id 3mr4767045qvr.38.1605306048874; Fri, 13 Nov 2020 14:20:48 -0800 (PST) Date: Fri, 13 Nov 2020 23:20:04 +0100 In-Reply-To: Message-Id: <38ed98141f58eb53eb23100caac212b1c1f3bc9f.1605305978.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v3 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 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: 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))