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=-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 5BD3EC433DB for ; Tue, 5 Jan 2021 18:28:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0415822CE3 for ; Tue, 5 Jan 2021 18:28:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0415822CE3 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 530288D00A6; Tue, 5 Jan 2021 13:28:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E01F8D00A5; Tue, 5 Jan 2021 13:28:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D17E8D00A6; Tue, 5 Jan 2021 13:28:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0205.hostedemail.com [216.40.44.205]) by kanga.kvack.org (Postfix) with ESMTP id 280C08D00A5 for ; Tue, 5 Jan 2021 13:28:25 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id DC72D1EE6 for ; Tue, 5 Jan 2021 18:28:24 +0000 (UTC) X-FDA: 77672556528.09.sun45_2801bd8274db Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 92FD7180AD81D for ; Tue, 5 Jan 2021 18:28:24 +0000 (UTC) X-HE-Tag: sun45_2801bd8274db X-Filterd-Recvd-Size: 4865 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 18:28:23 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id g4so481125qko.23 for ; Tue, 05 Jan 2021 10:28:23 -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=KRXpzoAkHqv6MlP+Q/fGJx09RWdmlAlIVzxtUVuwpVM=; b=Fb3Q6nCT57b+4oec7OslcxN7gAFtRYQJmn5KExlMD4IEMm/aMW+oydy50jC6i5Fi3I ozZK5SylYmuAGCpYHep2PY3CQIMgXQyCS1mNWz9BwzWk0h+zMnMBr8jfu/p58hR8voeQ Ox5qAB7CTTFDHlWYDh0sSWQjQlZcEUcI8dH0dQ/CMbIk6Vy32+JURCXcIr2jckjFJh+T DhGfUfCVDtASvkaZsJVSE+CJExCAjNej+oEOmZTzKwkYai4t5e6Cpz7OZK0EKqG241b/ V8DEmXfKegA/XsMJ6HE3j+YTV7XG3Zj0DNmo9rA3kz8kLKwyCoe1BGAFntOuNaAR6HVq wl2A== 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=KRXpzoAkHqv6MlP+Q/fGJx09RWdmlAlIVzxtUVuwpVM=; b=Yl2AbvRjLGYn1rj9KSchlvOy6BUQsux3EaCkG45hTKifGScLSYveMXnlHcr4qKIBxe ghUKbOntajQah3zRJo+Mc+4nXq64coBvyuPiJ16ym+zxAxVFmxSHJDmusKhRc7ILR4ix 9OUYPTE7zLXB849EgAHxwz+0PqR8HH1x0Ul2B1R3dvefMyYlVSXbs7WfNfRJJWuH/524 FOL57m+aBm5xFwuTud0Rgpkq1HOSsPgMSBwTGqp/crFC5gVR1WPUb0C9/Xp4ZXPHhgM2 Ng+ATOzgyu3JaZ/E2pPhLRAO4bbYSDQ42hddCNcizkbBiKW1tIw7tabNhootsCApcEKL ZeCA== X-Gm-Message-State: AOAM530SRa7uUPpC/Ur6tVlmN297rwWncJs/+zcZ87ydJBB32BvlMtE7 C114p/wodOvcF6xKj6AothlaFWfJZKvu/PBV X-Google-Smtp-Source: ABdhPJxT90gB7YILrKMHoRfd8xi56D/8zCgNctAzqvpw1JEB+6Jc2/mpZafdl3bgFb9he5+PwmsqWLivJbSsh8PS X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:b38b:: with SMTP id t11mr470993qve.58.1609871303254; Tue, 05 Jan 2021 10:28:23 -0800 (PST) Date: Tue, 5 Jan 2021 19:27:52 +0100 In-Reply-To: Message-Id: <9a4f47fe8717b4b249591b307cdd1f26c46dcb82.1609871239.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH 08/11] kasan: adopt kmalloc_uaf2 test to HW_TAGS mode 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 Content-Type: text/plain; charset="UTF-8" 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: In the kmalloc_uaf2() test, the pointers to the two allocated memory blocks might be the same, and the test will fail. With the software tag-based mode, the probability of the that happening is 1/254, so it's hard to observe the failure. For the hardware tag-based mode though, the probablity is 1/14, which is quite noticable. Allow up to 4 attempts at generating different tags for the tag-based modes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ibfa458ef2804ff465d8eb07434a300bf36388d55 --- lib/test_kasan.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index b5077a47b95a..b67da7f6e17f 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -375,7 +375,9 @@ static void kmalloc_uaf2(struct kunit *test) { char *ptr1, *ptr2; size_t size = 43; + int counter = 0; +again: ptr1 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); @@ -384,6 +386,13 @@ static void kmalloc_uaf2(struct kunit *test) ptr2 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); + /* + * For tag-based KASAN ptr1 and ptr2 tags might happen to be the same. + * Allow up to 4 attempts at generating different tags. + */ + if (!IS_ENABLED(CONFIG_KASAN_GENERIC) && ptr1 == ptr2 && counter++ < 4) + goto again; + KUNIT_EXPECT_KASAN_FAIL(test, ptr1[40] = 'x'); KUNIT_EXPECT_PTR_NE(test, ptr1, ptr2); -- 2.29.2.729.g45daf8777d-goog