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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 45793C4167B for ; Fri, 10 Sep 2021 00:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CDB46113E for ; Fri, 10 Sep 2021 00:54:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242734AbhIJAyq (ORCPT ); Thu, 9 Sep 2021 20:54:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:47350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbhIJAVd (ORCPT ); Thu, 9 Sep 2021 20:21:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 32A26611BD; Fri, 10 Sep 2021 00:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233223; bh=LfZfD7/CVxwnxr+xGrMtrciMRtiSh31lqfu9H5B3X20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qt4XGzAP+xojdWI8NKJkutFqupKviXcavQvWKdTFF57lrcdXBU+WVChn7JeUHvgev aHiLZxpw4iWPrwQ3K4HNwYDuKo+04mCZnrHNRUJLit4QyuhyyWkEQJhrDahBRmg+S5 h2Pd4T0+0VHV9pyh33UX9tkd4ee8Iwhkj7uNm83QDTjgHhvHc2FSQY02WnzN34oaR4 5Kza/Gsh/weFaKlLh10o7LMg5ZgzAHWindCCNQRThWROXlLF9Hk5ORzxHkBjIe7S99 mmuGWJfDqedqcMidqh6wMRqc2Zpvzol+VbK4lJqOEpXsVTjRNOh23JUFTCnc8J5rUz QBqs1LpKyTiqg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrey Konovalov , Marco Elver , Alexander Potapenko , Andrey Ryabinin , Dmitry Vyukov , Andrew Morton , Linus Torvalds , Sasha Levin , kasan-dev@googlegroups.com Subject: [PATCH AUTOSEL 5.13 86/88] kasan: test: clean up ksize_uaf Date: Thu, 9 Sep 2021 20:18:18 -0400 Message-Id: <20210910001820.174272-86-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910001820.174272-1-sashal@kernel.org> References: <20210910001820.174272-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Konovalov [ Upstream commit b38fcca339dbcf680c9e43054502608fabc81508 ] Some KASAN tests use global variables to store function returns values so that the compiler doesn't optimize away these functions. ksize_uaf() doesn't call any functions, so it doesn't need to use kasan_int_result. Use volatile accesses instead, to be consistent with other similar tests. Link: https://lkml.kernel.org/r/a1fc34faca4650f4a6e4dfb3f8d8d82c82eb953a.1628779805.git.andreyknvl@gmail.com Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Dmitry Vyukov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- lib/test_kasan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index c8ca85fd5e16..7a02ecc63b7b 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -726,8 +726,8 @@ static void ksize_uaf(struct kunit *test) kfree(ptr); KUNIT_EXPECT_KASAN_FAIL(test, ksize(ptr)); - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result = *ptr); - KUNIT_EXPECT_KASAN_FAIL(test, kasan_int_result = *(ptr + size)); + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[0]); + KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr)[size]); } static void kasan_stack_oob(struct kunit *test) -- 2.30.2