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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 3D77CC433DB for ; Wed, 3 Feb 2021 14:49:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CAAD364DF0 for ; Wed, 3 Feb 2021 14:49:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CAAD364DF0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=T78URw8q9RHlJAkzNbHRWXxCbE8hjL5eJV3MQO4zwGw=; b=eVTBqiqn/6ezFKXHru00r23i5 NMCuem8UvYHQxn63H9aAYSwFTBZsVLhDco3HOuG8Sc19ejfGkxXc3lA7fwL7vx3W98f6Aj92Ysy6m SzLOMtnrP1N3eYTiasNZpDSXHEn1pZ4KR1poEsOmLKN0A+UJ9OcpCpBb2Jm5YUlY0HoVZujZpjiaJ 7MCkIz9cRayJIpXA/k7l302hP11CFoLbEDAqh2h61NTlZF5YLRqH+9pzOjThbtT5kfkT4bFqfGuoL rlUxWCxJZz6FIymbx0chjyH0bcFpm2I0C0jhyUGly4/fnX+1LTXxKL98EN42lU1pEaUcuGKC9SQo6 KcjUCuxNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7JSP-000819-LA; Wed, 03 Feb 2021 14:48:37 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7JSM-000807-NG for linux-arm-kernel@lists.infradead.org; Wed, 03 Feb 2021 14:48:35 +0000 Received: by mail-wr1-x42a.google.com with SMTP id a1so24654897wrq.6 for ; Wed, 03 Feb 2021 06:48:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=9VGn7w2tNlFuEz50GpubxUEDNHCrhMt0WO2PGFie8Ao=; b=fQIVmx988C8vZV4BdPkzNRAlBu0QDAg8OIpAAYxaSbbZN2O6KeG8QEdXDlWxCxdCXY KrpYcmPW5iYelSzb7hKCSLv+9bLhCTwHeB5Ao6mnqbgnTSmj1ZwvFvCRdBUplg6vvpG1 bVNS98Uhs0Jayhzd6YCFHM64y6tyB8gQxqseQ5jNwmxEFtRJMvki764PRI5MbWZZCYVc RcxxeaFl0wgns9OOgtgvBJCu5TzmgL2h/H+AJAvytxKnYpNOs4GMCtzLMu2xzJxyhzVX MgV4YfXK5PWzSBKBEJGac0HNHDyzQjB/483/0mV95pzU+ZA/t5fnb6nQgFH9WpiuyHOi cZuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=9VGn7w2tNlFuEz50GpubxUEDNHCrhMt0WO2PGFie8Ao=; b=GkshFCxGwFF09askgG7ILM/XywThIS/57D6Fv1bzt1IHOnJyEdDaLUnT8D9nnmoX53 BuUGqe1oxW+jqiXr0Qx+p6KdZmF4kC5WQTW4wLWQdGs11Cc1aLK8sIXYeATLg6ly/22L zLArYi5UFMpsOjrLkTdNagHe9HDEks3NpHoH6ZlJ/geFNx1MxLmcJ8GeW55h5KZWU7lX xCcM6jlgTMFtUAouRrf/LBg21DPAt1sZjEjWDIdY2vD1nJN98uTc+V6UaX7VccBHWq/z FpeMDWpBIb8FkQTC1HHA+3GpfGrw5zGlC/DtXtmYiFdU4PeIWgmwMNNh/ONq8aqV+Gc1 9Qpg== X-Gm-Message-State: AOAM531wyiI84ax+V9F2K/H34hkt1qtX7veHanK4dmGA0ESxkVW8dZgj OYsWV8TahQxV66DWB6X5wYOxpg== X-Google-Smtp-Source: ABdhPJyUml8gBjD3JNc7G2wMLNsuJxRp8NFSdxFPy/XjyDzTEC8IZoyZ8vUF/vupgLJpqNGQsCsy1g== X-Received: by 2002:adf:c109:: with SMTP id r9mr3973330wre.261.1612363713245; Wed, 03 Feb 2021 06:48:33 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:b1de:c7d:30ce:1840]) by smtp.gmail.com with ESMTPSA id 17sm2919952wmk.48.2021.02.03.06.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 06:48:32 -0800 (PST) Date: Wed, 3 Feb 2021 15:48:25 +0100 From: Marco Elver To: Andrey Konovalov Subject: Re: [PATCH 06/12] kasan: rework krealloc tests Message-ID: References: <995edb531f4f976277d7da9ca8a78a96a2ea356e.1612208222.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <995edb531f4f976277d7da9ca8a78a96a2ea356e.1612208222.git.andreyknvl@google.com> User-Agent: Mutt/2.0.2 (2020-11-20) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210203_094834_848505_807D403F X-CRM114-Status: GOOD ( 22.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Feb 01, 2021 at 08:43PM +0100, Andrey Konovalov wrote: > This patch reworks KASAN-KUnit tests for krealloc() to: > > 1. Check both slab and page_alloc based krealloc() implementations. > 2. Allow at least one full granule to fit between old and new sizes for > each KASAN mode, and check accesses to that granule accordingly. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > lib/test_kasan.c | 91 ++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 81 insertions(+), 10 deletions(-) > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index 5699e43ca01b..2bb52853f341 100644 > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@ -258,11 +258,14 @@ static void kmalloc_large_oob_right(struct kunit *test) > kfree(ptr); > } > > -static void kmalloc_oob_krealloc_more(struct kunit *test) > +static void krealloc_more_oob_helper(struct kunit *test, > + size_t size1, size_t size2) > { > char *ptr1, *ptr2; > - size_t size1 = 17; > - size_t size2 = 19; > + size_t middle; > + > + KUNIT_ASSERT_LT(test, size1, size2); > + middle = size1 + (size2 - size1) / 2; > > ptr1 = kmalloc(size1, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); > @@ -270,15 +273,31 @@ static void kmalloc_oob_krealloc_more(struct kunit *test) > ptr2 = krealloc(ptr1, size2, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); > > - KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2 + OOB_TAG_OFF] = 'x'); > + /* All offsets up to size2 must be accessible. */ > + ptr2[size1 - 1] = 'x'; > + ptr2[size1] = 'x'; > + ptr2[middle] = 'x'; > + ptr2[size2 - 1] = 'x'; > + > + /* Generic mode is precise, so unaligned size2 must be inaccessible. */ > + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); > + > + /* For all modes first aligned offset after size2 must be inaccessible. */ > + KUNIT_EXPECT_KASAN_FAIL(test, > + ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); > + > kfree(ptr2); > } > > -static void kmalloc_oob_krealloc_less(struct kunit *test) > +static void krealloc_less_oob_helper(struct kunit *test, > + size_t size1, size_t size2) > { > char *ptr1, *ptr2; > - size_t size1 = 17; > - size_t size2 = 15; > + size_t middle; > + > + KUNIT_ASSERT_LT(test, size2, size1); > + middle = size2 + (size1 - size2) / 2; > > ptr1 = kmalloc(size1, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); > @@ -286,10 +305,60 @@ static void kmalloc_oob_krealloc_less(struct kunit *test) > ptr2 = krealloc(ptr1, size2, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); > > - KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2 + OOB_TAG_OFF] = 'x'); > + /* Must be accessible for all modes. */ > + ptr2[size2 - 1] = 'x'; > + > + /* Generic mode is precise, so unaligned size2 must be inaccessible. */ > + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); > + > + /* For all modes first aligned offset after size2 must be inaccessible. */ > + KUNIT_EXPECT_KASAN_FAIL(test, > + ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); > + > + /* > + * For all modes both middle and size1 should land in separate granules middle, size1, and size2? > + * and thus be inaccessible. > + */ > + KUNIT_EXPECT_LE(test, round_up(size2, KASAN_GRANULE_SIZE), > + round_down(middle, KASAN_GRANULE_SIZE)); > + KUNIT_EXPECT_LE(test, round_up(middle, KASAN_GRANULE_SIZE), > + round_down(size1, KASAN_GRANULE_SIZE)); > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2[middle] = 'x'); > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1 - 1] = 'x'); > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1] = 'x'); > + > kfree(ptr2); > } > > +static void krealloc_more_oob(struct kunit *test) > +{ > + krealloc_more_oob_helper(test, 201, 235); > +} > + > +static void krealloc_less_oob(struct kunit *test) > +{ > + krealloc_less_oob_helper(test, 235, 201); > +} > + > +static void krealloc_pagealloc_more_oob(struct kunit *test) > +{ > + /* page_alloc fallback in only implemented for SLUB. */ > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_SLUB); > + > + krealloc_more_oob_helper(test, KMALLOC_MAX_CACHE_SIZE + 201, > + KMALLOC_MAX_CACHE_SIZE + 235); > +} > + > +static void krealloc_pagealloc_less_oob(struct kunit *test) > +{ > + /* page_alloc fallback in only implemented for SLUB. */ > + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_SLUB); > + > + krealloc_less_oob_helper(test, KMALLOC_MAX_CACHE_SIZE + 235, > + KMALLOC_MAX_CACHE_SIZE + 201); > +} > + > static void kmalloc_oob_16(struct kunit *test) > { > struct { > @@ -983,8 +1052,10 @@ static struct kunit_case kasan_kunit_test_cases[] = { > KUNIT_CASE(pagealloc_oob_right), > KUNIT_CASE(pagealloc_uaf), > KUNIT_CASE(kmalloc_large_oob_right), > - KUNIT_CASE(kmalloc_oob_krealloc_more), > - KUNIT_CASE(kmalloc_oob_krealloc_less), > + KUNIT_CASE(krealloc_more_oob), > + KUNIT_CASE(krealloc_less_oob), > + KUNIT_CASE(krealloc_pagealloc_more_oob), > + KUNIT_CASE(krealloc_pagealloc_less_oob), > KUNIT_CASE(kmalloc_oob_16), > KUNIT_CASE(kmalloc_uaf_16), > KUNIT_CASE(kmalloc_oob_in_memset), > -- > 2.30.0.365.g02bc693789-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel