Skip to contentSkip to conversation

powerpc: Avoid code patching freed init sections

PATCH Superseded Michael Neuling 2 participants 2 messages Sep 13, 2018 PowerPC

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 powerpc: Avoid code patching freed init sections

This stops us from doing code patching in init sections after they've been freed.

In this chain:
kvm_guest_init() ->

    kvm_use_magic_page() ->
      fault_in_pages_readable() ->
	 __get_user() ->
	   __get_user_nocheck() ->
	     barrier_nospec();

We have a code patching location at barrier_nospec() and kvm_guest_init() is an init function. This whole chain gets inlined, so when we free the init section (hence kvm_guest_init()), this code goes away and hence should no longer be patched.

We seen this as userspace memory corruption when using a memory checker while doing partition migration testing on powervm (this starts the code patching post migration via /sys/kernel/mobility/migration). In theory, it could also happen when using /sys/kernel/debug/powerpc/barrier_nospec.

---
For stable I've marked this as v4.13+ since that's when we refactored code-patching.c but it could go back even further than that. In reality though, I think we can only hit this since the first spectre/meltdown changes.

v3:
Add init_mem_free flag to avoid potential race.
Feedback from Christophe Leroy:
- use init_section_contains()
- change order of init test for performance
- use pr_debug()
- remove blank line

v2:
Print when we skip an address

---
 arch/powerpc/include/asm/setup.h | 1 +
 arch/powerpc/lib/code-patching.c | 7 +++++++
 arch/powerpc/mm/mem.c            | 2 ++
 3 files changed, 10 insertions(+)
arch/powerpc/include/asm/setup.h +1 -0
index 1a951b0046..4b4522b738 100644
@@ -9,6 +9,7 @@ extern void ppc_printk_progress(char *s, unsigned short hex);
 
 extern unsigned int rtas_data;
 extern unsigned long long memory_limit;
+extern bool init_mem_free;
 extern unsigned long klimit;
 extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
arch/powerpc/lib/code-patching.c +7 -0
index 850f3b8f4d..dacd6cef92 100644
@@ -28,6 +28,13 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,
 {
 	int err;
 
+	/* Make sure we aren't patching a freed init section */
+	if (init_mem_free && init_section_contains(exec_addr, 4)) {
+		pr_debug("Skipping init section patching addr: 0x%lx\n",
+			 (unsigned long)exec_addr);
+		return 0;
+	}
+
 	__put_user_size(instr, patch_addr, 4, err);
 	if (err)
 		return err;
arch/powerpc/mm/mem.c +2 -0
index 5c8530d0c6..b9d59e1a83 100644
@@ -63,6 +63,7 @@
 #endif
 
 unsigned long long memory_limit;
+bool init_mem_free;
 
 #ifdef CONFIG_HIGHMEM
 pte_t *kmap_pte;
@@ -396,6 +397,7 @@ void free_initmem(void)
 {
 	ppc_md.progress = ppc_printk_progress;
 	mark_initmem_nx();
+	init_mem_free = true;
 	free_initmem_default(POISON_FREE_INITMEM);
 }
 
Signature · 1 line
2.17.1
Reviewed-by on v3 1/1
#1 lore raw

Le 13/09/2018 à 05:03, Michael Neuling a écrit :

Quoted 52 lines

This stops us from doing code patching in init sections after they've been freed.

In this chain:

   kvm_guest_init() ->
     kvm_use_magic_page() ->
       fault_in_pages_readable() ->
	 __get_user() ->
	   __get_user_nocheck() ->
	     barrier_nospec();

We have a code patching location at barrier_nospec() and kvm_guest_init() is an init function. This whole chain gets inlined, so when we free the init section (hence kvm_guest_init()), this code goes away and hence should no longer be patched.

We seen this as userspace memory corruption when using a memory checker while doing partition migration testing on powervm (this starts the code patching post migration via /sys/kernel/mobility/migration). In theory, it could also happen when using /sys/kernel/debug/powerpc/barrier_nospec.

---
For stable I've marked this as v4.13+ since that's when we refactored code-patching.c but it could go back even further than that. In reality though, I think we can only hit this since the first spectre/meltdown changes.

v3:
Add init_mem_free flag to avoid potential race.
Feedback from Christophe Leroy:
- use init_section_contains()
- change order of init test for performance
- use pr_debug()
- remove blank line

v2:
Print when we skip an address

---
  arch/powerpc/include/asm/setup.h | 1 +
  arch/powerpc/lib/code-patching.c | 7 +++++++
  arch/powerpc/mm/mem.c            | 2 ++
  3 files changed, 10 insertions(+)
arch/powerpc/include/asm/setup.h +0 -0
index 1a951b0046..4b4522b738 100644

arch/powerpc/include/asm/setup.h extern void ppc_printk_progress(char *s, unsigned short hex); · line 12

Quoted 4 lines
arch/powerpc/include/asm/setup.h +1 -0
@@ -9,6 +9,7 @@ extern void ppc_printk_progress(char *s, unsigned short hex);
 
  extern unsigned int rtas_data;
  extern unsigned long long memory_limit;
+extern bool init_mem_free;

Calling it init_mem_is_free would be more explicit. Here one might think that it contains the amount of free memory.

Quoted 8 lines
arch/powerpc/include/asm/setup.h +0 -0
  extern unsigned long klimit;
  extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
arch/powerpc/lib/code-patching.c +0 -0
index 850f3b8f4d..dacd6cef92 100644

arch/powerpc/lib/code-patching.c static int __patch_instruction(unsigned int *exec_addr, unsigned int instr, · line 34

Quoted 7 lines
arch/powerpc/lib/code-patching.c +4 -0
@@ -28,6 +28,13 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,
  {
  	int err;
 
+	/* Make sure we aren't patching a freed init section */
+	if (init_mem_free && init_section_contains(exec_addr, 4)) {
+		pr_debug("Skipping init section patching addr: 0x%lx\n",
+			 (unsigned long)exec_addr);

Using %px instead of %lx would avoid having to cast exec_addr, and then it would fit in one line (in arch/powerpc we accept lines of 90 chars)

Quoted 20 lines
arch/powerpc/lib/code-patching.c +3 -0
+		return 0;
+	}
+
  	__put_user_size(instr, patch_addr, 4, err);
  	if (err)
  		return err;
arch/powerpc/mm/mem.c +1 -0
index 5c8530d0c6..b9d59e1a83 100644
@@ -63,6 +63,7 @@
  #endif
 
  unsigned long long memory_limit;
+bool init_mem_free;
 
  #ifdef CONFIG_HIGHMEM
  pte_t *kmap_pte;

arch/powerpc/mm/mem.c void free_initmem(void) · line 403

Quoted 7 lines
arch/powerpc/mm/mem.c +1 -0
@@ -396,6 +397,7 @@ void free_initmem(void)
  {
  	ppc_md.progress = ppc_printk_progress;
  	mark_initmem_nx();
+	init_mem_free = true;
  	free_initmem_default(POISON_FREE_INITMEM);
  }
 

Christophe