mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Richard Weinberger" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Mike Rapoport (Microsoft)" <rppt@kernel.org>,
	Richard Weinberger <richard@nod.at>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Vinny Horgan <vinnyhorgan@gmail.com>,
	stable@vger.kernel.org, x86@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/Kconfig: Enable ROX also when STRICT_KERNEL_RWX is present
Date: Sat, 21 Nov 2026 19:22:12 -0000	[thread overview]
Message-ID: <179528893241.92412.16620607999563559576.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260625090627.1501095-1-richard@nod.at>

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     ae3398a7da224e1cb14a04ce8e9da66fc2948121
Gitweb:        https://git.kernel.org/tip/ae3398a7da224e1cb14a04ce8e9da66fc2948121
Author:        Richard Weinberger <richard@nod.at>
AuthorDate:    Thu, 25 Jun 2026 11:06:27 +02:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sat, 21 Nov 2026 11:06:09 -08:00

x86/Kconfig: Enable ROX also when STRICT_KERNEL_RWX is present

Running a kernel with CONFIG_MODULES=n causes the W+X page detection
to trigger:

  x86/mm: Found insecure W+X mapping at address 0xffffffffc033a000

The W+X pages come from __its_alloc() with type being EXECMEM_MODULE_TEXT.
Without ARCH_HAS_EXECMEM_ROX pgprot is PAGE_KERNEL instead of PAGE_KERNEL_ROX.

Fixes: 47410d839fcda ("x86/Kconfig: only enable ROX cache in execmem when STRICT_MODULE_RWX is set")
Suggested-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Tested-by: Vinny Horgan <vinnyhorgan@gmail.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260625090627.1501095-1-richard@nod.at
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 58dce0b..3159852 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -84,7 +84,7 @@ config X86
 	select ARCH_HAS_DMA_OPS			if GART_IOMMU || XEN
 	select ARCH_HAS_EARLY_DEBUG		if KGDB
 	select ARCH_HAS_ELF_RANDOMIZE
-	select ARCH_HAS_EXECMEM_ROX		if X86_64 && STRICT_MODULE_RWX
+	select ARCH_HAS_EXECMEM_ROX		if X86_64 && (STRICT_MODULE_RWX || STRICT_KERNEL_RWX)
 	select ARCH_HAS_FAST_MULTIPLIER
 	select ARCH_HAS_FORTIFY_SOURCE
 	select ARCH_HAS_GCOV_PROFILE_ALL

      parent reply	other threads:[~2026-11-21 19:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-25  9:06 [PATCH] x86/Kconfig: enable " Richard Weinberger
2026-06-25  9:17 ` Mike Rapoport
2026-06-25  9:19 ` Peter Zijlstra
2026-11-21 15:30 ` Vinny Horgan
2026-11-21 19:22 ` tip-bot2 for Richard Weinberger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179528893241.92412.16620607999563559576.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=richard@nod.at \
    --cc=rppt@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=vinnyhorgan@gmail.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®