From patchwork Tue Jan 5 18:27:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12000109 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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 8AC01C433DB for ; Tue, 5 Jan 2021 18:28:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4038122CE3 for ; Tue, 5 Jan 2021 18:28:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4038122CE3 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 9EC528D00A8; Tue, 5 Jan 2021 13:28:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94C8F8D00A7; Tue, 5 Jan 2021 13:28:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83B1D8D00A8; Tue, 5 Jan 2021 13:28:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id 6ACDB8D00A7 for ; Tue, 5 Jan 2021 13:28:27 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 38A403629 for ; Tue, 5 Jan 2021 18:28:27 +0000 (UTC) X-FDA: 77672556654.07.boat30_0a09131274db Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 031261803F9B0 for ; Tue, 5 Jan 2021 18:28:26 +0000 (UTC) X-HE-Tag: boat30_0a09131274db X-Filterd-Recvd-Size: 5145 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 18:28:26 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id cc1so388190qvb.3 for ; Tue, 05 Jan 2021 10:28:26 -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=iBAofrYhtWdvm45KaDvHp4GorxFru4go+vxs4/2NiTo=; b=KhhzCW5Es0nmSwmYkGHPGV3OGnAcoZc7jwfMbTCbCegBDHXqF5DT8rkvlPE1yIST+o YEVKKkxEvMOk/SLecNzaD6NXqilvTc8a2f2w2cFRB94lDfJSW043ea4L+TWP+h4PTPcm XZaV27X5QjrMJ3W86t6eGFjgcjoIXsOMabPka26suv2tXMMEa4sSd6qp4ZRWu/8rMri4 radLuY707IJUKEWW2iqRvaEB7j0HgxYLHeWZNGvjBPJ4uKDVQ+C3xGF9GGZ5kGPg+0LY fJd9knwm/PQxFTpoq7S/RzOqqxhlzr1ECWNzghOssFSwsr0qcptOTpJnyq4jJAAo5ke6 bfJA== 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=iBAofrYhtWdvm45KaDvHp4GorxFru4go+vxs4/2NiTo=; b=mdydU4Cz7nuJSdbv+Q3Pzb44HSIKMn4Imxknza+rFJDRJ1QDzASuyXez7eTp9FNx4J Szn3TfNo6o6Nv7c5WSHDCliKKOAg9KMhYRbPChj1t4xMLYzE0oUNUGwLVLDA7VGEQrWw t04So47PXPIa7oF87ZYWWzUB64NtfvfeXlA7R8MzL1h+uBaRa5pk8u02aVj+7XPXMoDK zPmelq+i0jsyVMCxI2e4MbGBJ03wb7xhNWMz3kdAARvyLFs+dwjsYTl44KyocxPDX+ws ypAItZZVCfxMfufBWLSWZiWXESLkQrlzq/rIFMc2altQih6D89ncwrJta9lm/yNSDxhU Zjng== X-Gm-Message-State: AOAM531nBQKT+lhDdZuMNmY3+DYnIeHB7IaV8mnnMKar+r/neee0fkrs vWan9SjDLjzxpYSzGK5EI5KgILz7lmFlD5xc X-Google-Smtp-Source: ABdhPJz9ZeKojsIaFk7oiCjyflKtBkBDpOWYVQ94sBgXV9c8H5cDJw47Fn8opToDG7AunMFDOU1CSaq1S5pOZ82S X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:e90a:: with SMTP id a10mr863092qvo.38.1609871305814; Tue, 05 Jan 2021 10:28:25 -0800 (PST) Date: Tue, 5 Jan 2021 19:27:53 +0100 In-Reply-To: Message-Id: <0c51a7266ea851797dc9816405fc40d860a48db1.1609871239.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH 09/11] kasan: fix memory corruption in kasan_bitops_tags test From: Andrey Konovalov To: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Andrew Morton , Will Deacon , Andrey Ryabinin , 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: Since the hardware tag-based KASAN mode might not have a redzone that comes after an allocated object (when kasan.mode=prod is enabled), the kasan_bitops_tags() test ends up corrupting the next object in memory. Change the test so it always accesses the redzone that lies within the allocated object's boundaries. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I67f51d1ee48f0a8d0fe2658c2a39e4879fe0832a Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko --- lib/test_kasan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index b67da7f6e17f..3ea52da52714 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -771,17 +771,17 @@ static void kasan_bitops_tags(struct kunit *test) /* This test is specifically crafted for the tag-based mode. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { - kunit_info(test, "skipping, CONFIG_KASAN_SW_TAGS required"); + kunit_info(test, "skipping, CONFIG_KASAN_SW/HW_TAGS required"); return; } - /* Allocation size will be rounded to up granule size, which is 16. */ - bits = kzalloc(sizeof(*bits), GFP_KERNEL); + /* kmalloc-64 cache will be used and the last 16 bytes will be the redzone. */ + bits = kzalloc(48, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bits); - /* Do the accesses past the 16 allocated bytes. */ - kasan_bitops_modify(test, BITS_PER_LONG, &bits[1]); - kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, &bits[1]); + /* Do the accesses past the 48 allocated bytes, but within the redone. */ + kasan_bitops_modify(test, BITS_PER_LONG, (void *)bits + 48); + kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, (void *)bits + 48); kfree(bits); }