From patchwork Wed Mar 31 16:24:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12175693 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, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 13E74C433ED for ; Wed, 31 Mar 2021 16:25:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8D21C6100B for ; Wed, 31 Mar 2021 16:25:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D21C6100B 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 A6C956B007E; Wed, 31 Mar 2021 12:25:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F4B06B0080; Wed, 31 Mar 2021 12:25:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86DF56B0081; Wed, 31 Mar 2021 12:25:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 6A8C16B007E for ; Wed, 31 Mar 2021 12:25:04 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 1DEB645AB for ; Wed, 31 Mar 2021 16:25:04 +0000 (UTC) X-FDA: 77980693728.34.7C96616 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf04.hostedemail.com (Postfix) with ESMTP id F3BC53C0 for ; Wed, 31 Mar 2021 16:25:02 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id b78so1743164qkg.13 for ; Wed, 31 Mar 2021 09:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=fCRp+f9oEZRwz2tLs+x5UFPxXT2k+8MTEajLiG543iE=; b=E0qHaj7GNQHth1b1XDiydbi3LRxgSyXTRIt30yJXGr4euLVP08l00Kj4vigGox7iJE jBzfkUHPMmM/Su9k+GGHog40ud31Bv7dlve/m0FKG2DG23BU8HpQY7gQoCuDsBBRH22B CdY5qwoGoXR1W4nKtTgzqNuaICGfR3dR7sgKvCnxFJvoIjsjEd1EHMc0dyRrjwp45/hg eGFpOYrqWX68R6j8n91eZ8spafWkdPLPObVCDafOl/6dzjSmjX4vXlrowomC/MCrslIn Mp4Z4ggUIY640HII3euetw3kp67GfIyHfYix7mB77RrammP9A2Ssi2oVpQqJPcQQqVnK dHKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=fCRp+f9oEZRwz2tLs+x5UFPxXT2k+8MTEajLiG543iE=; b=KgeflbxQfQnnJDCRKmBxwG8wrOEvcQg20Mpsw1uAopqZakB/J0LLCaTZR95MguJwTR psrCzzfr6z1R47zTn6VvFRWJ0WLKGlK2nOpDkXkkEuC4TVWb7GWDT6swt7Jk15a4MLJh VHKMO2Twws0fCaqfQTTLqGt1w034DaOXeDAqQghCMrrbZC/hpeJJzId9zxd1R2KBAwVx IPR4rEdLxkxgZAj3eKkEsGvH1o/Oc738V2JEyg+3p3L5d14QVWp5PmkNRKynR8LUPSko Kr83/pP6j3li2PuHOI0/mKD7wgSvUfO3UrpHpsuLQDGMSQS7sFZZCfh8ryyTPJEt4tqE l0JQ== X-Gm-Message-State: AOAM530o4BbLzAFsVvkRF0jgrIQk28g8eY1hgSsuom2fuydoG9MXXi+q ScAaksp5i2g/xC/XCYnvJp86xecTw//5Y8aZ X-Google-Smtp-Source: ABdhPJxJoNO1B+fBvpC9kIudNhGjiUeJQbEm2VvLjUu0bQ1W0X8zAukiVTCaZU+TUNC5zkLU9rn/JCMdUCPaaB5L X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:f189:6e8f:457f:e245]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:16c1:: with SMTP id d1mr3810787qvz.29.1617207902660; Wed, 31 Mar 2021 09:25:02 -0700 (PDT) Date: Wed, 31 Mar 2021 18:24:59 +0200 Message-Id: <48079c52cc329fbc52f4386996598d58022fb872.1617207873.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH] kasan: detect false-positives in tests From: Andrey Konovalov To: Andrew Morton Cc: Alexander Potapenko , Marco Elver , Dmitry Vyukov , Andrey Ryabinin , Andrey Konovalov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: F3BC53C0 X-Stat-Signature: z641t8od7wc8369ofj5ng3g8spsuis7q Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from="<3XqJkYAoKCD8boesfzlowmhpphmf.dpnmjovy-nnlwbdl.psh@flex--andreyknvl.bounces.google.com>"; helo=mail-qk1-f201.google.com; client-ip=209.85.222.201 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617207902-104620 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: Currently, KASAN-KUnit tests can check that a particular annotated part of code causes a KASAN report. However, they do not check that no unwanted reports happen between the annotated parts. This patch implements these checks. It is done by setting report_data.report_found to false in kasan_test_init() and at the end of KUNIT_EXPECT_KASAN_FAIL() and then checking that it remains false at the beginning of KUNIT_EXPECT_KASAN_FAIL() and in kasan_test_exit(). kunit_add_named_resource() call is moved to kasan_test_init(), and the value of fail_data.report_expected is kept as false in between KUNIT_EXPECT_KASAN_FAIL() annotations for consistency. Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver --- lib/test_kasan.c | 49 +++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index d77c45edc7cd..bf9225002a7e 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -54,6 +54,10 @@ static int kasan_test_init(struct kunit *test) multishot = kasan_save_enable_multi_shot(); kasan_set_tagging_report_once(false); + fail_data.report_found = false; + fail_data.report_expected = false; + kunit_add_named_resource(test, NULL, NULL, &resource, + "kasan_data", &fail_data); return 0; } @@ -61,6 +65,7 @@ static void kasan_test_exit(struct kunit *test) { kasan_set_tagging_report_once(true); kasan_restore_multi_shot(multishot); + KUNIT_EXPECT_FALSE(test, fail_data.report_found); } /** @@ -78,28 +83,30 @@ static void kasan_test_exit(struct kunit *test) * fields, it can reorder or optimize away the accesses to those fields. * Use READ/WRITE_ONCE() for the accesses and compiler barriers around the * expression to prevent that. + * + * In between KUNIT_EXPECT_KASAN_FAIL checks, fail_data.report_found is kept as + * false. This allows detecting KASAN reports that happen outside of the checks + * by asserting !fail_data.report_found at the start of KUNIT_EXPECT_KASAN_FAIL + * and in kasan_test_exit. */ -#define KUNIT_EXPECT_KASAN_FAIL(test, expression) do { \ - if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) \ - migrate_disable(); \ - WRITE_ONCE(fail_data.report_expected, true); \ - WRITE_ONCE(fail_data.report_found, false); \ - kunit_add_named_resource(test, \ - NULL, \ - NULL, \ - &resource, \ - "kasan_data", &fail_data); \ - barrier(); \ - expression; \ - barrier(); \ - KUNIT_EXPECT_EQ(test, \ - READ_ONCE(fail_data.report_expected), \ - READ_ONCE(fail_data.report_found)); \ - if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { \ - if (READ_ONCE(fail_data.report_found)) \ - kasan_enable_tagging(); \ - migrate_enable(); \ - } \ +#define KUNIT_EXPECT_KASAN_FAIL(test, expression) do { \ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) \ + migrate_disable(); \ + KUNIT_EXPECT_FALSE(test, READ_ONCE(fail_data.report_found)); \ + WRITE_ONCE(fail_data.report_expected, true); \ + barrier(); \ + expression; \ + barrier(); \ + KUNIT_EXPECT_EQ(test, \ + READ_ONCE(fail_data.report_expected), \ + READ_ONCE(fail_data.report_found)); \ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { \ + if (READ_ONCE(fail_data.report_found)) \ + kasan_enable_tagging(); \ + migrate_enable(); \ + } \ + WRITE_ONCE(fail_data.report_found, false); \ + WRITE_ONCE(fail_data.report_expected, false); \ } while (0) #define KASAN_TEST_NEEDS_CONFIG_ON(test, config) do { \