Commit 962da4d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.11-rc7' of... 

Merge tag 'parisc-for-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture fix from Helge Deller:

 - Fix boot issue where boot memory is marked read-only too early

* tag 'parisc-for-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Delay write-protection until mark_rodata_ro() call
parents 76c0f27d 213aa670

arch/parisc/mm/init.c

+11 −5
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ void free_initmem(void) 
	unsigned long kernel_end  = (unsigned long)&_end;



	/* Remap kernel text and data, but do not touch init section yet. */

	kernel_set_to_readonly = true;

	map_pages(init_end, __pa(init_end), kernel_end - init_end,

		  PAGE_KERNEL, 0);
@@ -493,11 +492,18 @@ void free_initmem(void) 
#ifdef CONFIG_STRICT_KERNEL_RWX

void mark_rodata_ro(void)

{

	/* rodata memory was already mapped with KERNEL_RO access rights by

           pagetable_init() and map_pages(). No need to do additional stuff here */

	unsigned long roai_size = __end_ro_after_init - __start_ro_after_init;

	unsigned long start = (unsigned long) &__start_rodata;

	unsigned long end = (unsigned long) &__end_rodata;



	pr_info("Write protecting the kernel read-only data: %luk\n",

	       (end - start) >> 10);



	kernel_set_to_readonly = true;

	map_pages(start, __pa(start), end - start, PAGE_KERNEL, 0);



	pr_info("Write protected read-only-after-init data: %luk\n", roai_size >> 10);

	/* force the kernel to see the new page table entries */

	flush_cache_all();

	flush_tlb_all();

}

#endif