1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 968f51a2e39b..a7324045d87d 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -298,9 +298,11 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
 
         /*
          * The .rodata section needs to be read-only. Using the pfn
-         * catches all aliases.
+         * catches all aliases.  This also includes __ro_after_init,
+         * so do not enforce until kernel_set_to_readonly is true.
          */
-        if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
+        if (kernel_set_to_readonly &&
+            within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
                    __pa_symbol(__end_rodata) >> PAGE_SHIFT))
                 pgprot_val(forbidden) |= _PAGE_RW;