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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAF96C25B08 for ; Sun, 14 Aug 2022 15:47:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241341AbiHNPrK (ORCPT ); Sun, 14 Aug 2022 11:47:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241472AbiHNPpG (ORCPT ); Sun, 14 Aug 2022 11:45:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91EB52494E; Sun, 14 Aug 2022 08:34:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 44E8760C58; Sun, 14 Aug 2022 15:34:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B189C433D6; Sun, 14 Aug 2022 15:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660491252; bh=KrGw3jvz3VlrB6s/KQb6fT3Ak7ZC19uSgWY1w7Xat7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VdcMjWcXeSdwWxkGrBuF0iuEWlEXQw8yaSclbeTX3dMgg5AHUsmOrqS3XyDfY0+Jp 0ZpZCuaDzc+jiKcXEEiaEwqqCi0U9MZMLycMZiiA/qHYqD+IAnMZshSFy4CRTquzKn hL4F4YkhKbapdWSTLszS19F2PQedDG4+QTqGxBIt5P22xvkcm2ouYCfuxHkccWceM/ wLaYhFLJ+66n/rVvJKWuJNrX0oY4QCUq6GVr/73Cy3T57IaZV0eudCi6RrAYl36wsh 0jxZd7MX3GbnXEcRFKGJZHMGS9hWIIQ1ArwxhimeNoEfMcr9kkvhCE2q5zB91cAdyp I9CKDKuhEd8wA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lecopzer Chen , Linus Walleij , Russell King , Sasha Levin , linux@armlinux.org.uk, ryabinin.a.a@gmail.com, matthias.bgg@gmail.com, arnd@arndb.de, ardb@kernel.org, rostedt@goodmis.org, nick.hawkins@hpe.com, john@phrozen.org, linux-arm-kernel@lists.infradead.org, kasan-dev@googlegroups.com, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 38/46] ARM: 9202/1: kasan: support CONFIG_KASAN_VMALLOC Date: Sun, 14 Aug 2022 11:32:39 -0400 Message-Id: <20220814153247.2378312-38-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814153247.2378312-1-sashal@kernel.org> References: <20220814153247.2378312-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: Lecopzer Chen [ Upstream commit 565cbaad83d83e288927b96565211109bc984007 ] Simply make shadow of vmalloc area mapped on demand. Since the virtual address of vmalloc for Arm is also between MODULE_VADDR and 0x100000000 (ZONE_HIGHMEM), which means the shadow address has already included between KASAN_SHADOW_START and KASAN_SHADOW_END. Thus we need to change nothing for memory map of Arm. This can fix ARM_MODULE_PLTS with KASan, support KASan for higmem and support CONFIG_VMAP_STACK with KASan. Signed-off-by: Lecopzer Chen Tested-by: Linus Walleij Reviewed-by: Linus Walleij Signed-off-by: Russell King (Oracle) Signed-off-by: Sasha Levin --- arch/arm/Kconfig | 1 + arch/arm/mm/kasan_init.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4ebd512043be..44f328fa5996 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -71,6 +71,7 @@ config ARM select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL + select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_PFN_VALID select HAVE_ARCH_SECCOMP diff --git a/arch/arm/mm/kasan_init.c b/arch/arm/mm/kasan_init.c index 4b1619584b23..040346cc4a3a 100644 --- a/arch/arm/mm/kasan_init.c +++ b/arch/arm/mm/kasan_init.c @@ -236,7 +236,11 @@ void __init kasan_init(void) clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END); - kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START), + if (!IS_ENABLED(CONFIG_KASAN_VMALLOC)) + kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START), + kasan_mem_to_shadow((void *)VMALLOC_END)); + + kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_END), kasan_mem_to_shadow((void *)-1UL) + 1); for_each_mem_range(i, &pa_start, &pa_end) { -- 2.35.1