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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 73ED6C3B19F for ; Fri, 14 Feb 2020 16:09:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E7DF2468F for ; Fri, 14 Feb 2020 16:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696598; bh=qx0feBG45tvPbKDjRUD1++ZyJhdGAaL+17Qi5700Nos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F5tjAOUvWePEYLyjzHDrCxQ9eN4YRL5spv5yKpkaebJBad4cxh6ZhWoMXtRzwdjwn oxyaZs/r3sBBXhJ2ANjTP9GLHhtHNN+atEBqRiRrsPUww71rVBCfnJizBwyw8nB+9d 1zQUcVTzbs4c6R5ZjVVaXLAyuo3IjhsRXp+36bPw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391372AbgBNQJ5 (ORCPT ); Fri, 14 Feb 2020 11:09:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:35016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391369AbgBNQJ4 (ORCPT ); Fri, 14 Feb 2020 11:09:56 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 978B524676; Fri, 14 Feb 2020 16:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696596; bh=qx0feBG45tvPbKDjRUD1++ZyJhdGAaL+17Qi5700Nos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dqPJ1Q0z4kXj2kKczyMTuFOfA/u/lPnabOdY1zV5yUHxddbTpQu9YFzdkyAllWVea B9wqvLKMUjKCtisgPpgBPjclhf5euFGxJw+KqSkxdj5JK6TyKlY5kmxtYrQhIOiP/q 2PHtd7BU4eYweE7QQLvCGKYChvxWv0xK+Q+XAcOQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Leroy , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.4 382/459] powerpc/ptdump: Only enable PPC_CHECK_WX with STRICT_KERNEL_RWX Date: Fri, 14 Feb 2020 11:00:32 -0500 Message-Id: <20200214160149.11681-382-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe Leroy [ Upstream commit f509247b08f2dcf7754d9ed85ad69a7972aa132b ] ptdump_check_wx() is called from mark_rodata_ro() which only exists when CONFIG_STRICT_KERNEL_RWX is selected. Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/922d4939c735c6b52b4137838bcc066fffd4fc33.1578989545.git.christophe.leroy@c-s.fr Signed-off-by: Sasha Levin --- arch/powerpc/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index c59920920ddc4..b915fe6589792 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -371,7 +371,7 @@ config PPC_PTDUMP config PPC_DEBUG_WX bool "Warn on W+X mappings at boot" - depends on PPC_PTDUMP + depends on PPC_PTDUMP && STRICT_KERNEL_RWX help Generate a warning if any W+X mappings are found at boot. -- 2.20.1