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=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 4903EC433EF for ; Fri, 10 Sep 2021 00:42:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 333596115A for ; Fri, 10 Sep 2021 00:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241166AbhIJAnn (ORCPT ); Thu, 9 Sep 2021 20:43:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:45720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233080AbhIJATX (ORCPT ); Thu, 9 Sep 2021 20:19:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 82719610A3; Fri, 10 Sep 2021 00:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233093; bh=qLMh2ILhuB7N7DzYi1DOB591d0xmf7CbQLqtx0HG6hs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J3qnWjPs6b/vf8+EQOLqTTNkckB2fVJ49TxRb4Ryq3N3CjYvhTnRh3SuAJAzhAbUE GwDmIV9pYE95sLZ/42pt6Er7UJhCEHrKaKqxOkoV0A0do+ojqZSeynNQ9BRq6MMAUl hYSL54Vaiy/kdSXJaMOpQ5CYVsM1YuE7Ycjddb0uxQHo2r68Xy9yg1ZNCHw/GxHkok DORVDTHawXOgVIRa0e+MwGYKvgeryRk/0ekIrmBsx3SL/CCQdhStEjllvC2K3q5pkL E9GM/kFL2tFWdkxB9CS22HzdeopkxHzppHZG8jPqAM3uKnKgITWIw8c15n62LaPk+x /Jlq4/xbsZUmg== 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.14 96/99] kasan: test: only do kmalloc_uaf_memset for generic mode Date: Thu, 9 Sep 2021 20:15:55 -0400 Message-Id: <20210910001558.173296-96-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910001558.173296-1-sashal@kernel.org> References: <20210910001558.173296-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: stable@vger.kernel.org From: Andrey Konovalov [ Upstream commit 25b12a58e848459ae2dbf2e7d318ef168bd1c5e2 ] kmalloc_uaf_memset() writes to freed memory, which is only safe with the GENERIC mode (as it uses quarantine). For other modes, this test corrupts kernel memory, which might result in a crash. Only enable kmalloc_uaf_memset() for the GENERIC mode. Link: https://lkml.kernel.org/r/2e1c87b607b1292556cde3cab2764f108542b60c.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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index c149675300bd..65adde0757a3 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -518,6 +518,12 @@ static void kmalloc_uaf_memset(struct kunit *test) char *ptr; size_t size = 33; + /* + * Only generic KASAN uses quarantine, which is required to avoid a + * kernel memory corruption this test causes. + */ + KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); + ptr = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); -- 2.30.2