Skip to contentSkip to conversation

Simple NX lowmem mappings

PATCH New Russell King - ARM Linux 3 participants 4 messages Oct 24, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Simple NX lowmem mappings

This patch has similar functionality to Laura's patch set earlier this month, except I've just done the basic change - we don't increase the size of the kernel for this, so there should be no kernel size related problems with this. We mark sections which do not overlap any kernel text as non-executable.

8<====
From: Russell King <[email protected]>
ARM: Implement basic NX support for kernel lowmem mappings

Add basic NX support for kernel lowmem mappings. We mark any section which does not overlap kernel text as non-executable, preventing it from being used to write code and then execute directly from there.

This does not change the alignment of the sections, so the kernel image doesn't grow significantly via this change, so we can do this without needing a config option.

---
 arch/arm/include/asm/mach/map.h |   27 ++++++++++--------
 arch/arm/mm/mmu.c               |   55 +++++++++++++++++++++++++++++++++++---
 2 files changed, 65 insertions(+), 17 deletions(-)
arch/arm/include/asm/mach/map.h +15 -12
index 2fe141f..d43f100 100644
@@ -22,18 +22,21 @@ struct map_desc {
 };
 
 /* types 0-3 are defined in asm/io.h */
-#define MT_UNCACHED		4
-#define MT_CACHECLEAN		5
-#define MT_MINICLEAN		6
-#define MT_LOW_VECTORS		7
-#define MT_HIGH_VECTORS		8
-#define MT_MEMORY		9
-#define MT_ROM			10
-#define MT_MEMORY_NONCACHED	11
-#define MT_MEMORY_DTCM		12
-#define MT_MEMORY_ITCM		13
-#define MT_MEMORY_SO		14
-#define MT_MEMORY_DMA_READY	15
+enum {
+	MT_UNCACHED = 4,
+	MT_CACHECLEAN,
+	MT_MINICLEAN,
+	MT_LOW_VECTORS,
+	MT_HIGH_VECTORS,
+	MT_MEMORY,
+	MT_MEMORY_NX,
+	MT_ROM,
+	MT_MEMORY_NONCACHED,
+	MT_MEMORY_DTCM,
+	MT_MEMORY_ITCM,
+	MT_MEMORY_SO,
+	MT_MEMORY_DMA_READY,
+};
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
arch/arm/mm/mmu.c +50 -5

98 lines not on this page · raw message

#1 lore raw

PATCH 1/1 Simple NX lowmem mappings

Hi,

Thanks for starting this work!

Quoted 4 lines · Russel

-#define MT_MEMORY 9
[...]
+ MT_MEMORY,
+ MT_MEMORY_NX,

Instead of these names, let's more fully describe the protections. "NX" doesn't say anything about RO vs RW. Instead, how about:

MT_MEMORY_RWX (to replace MT_MEMORY) MT_MEMORY_RW (as the new "NX" in use for this patch)

for the first change? Then as we move forward, we can add:

MT_MEMORY_R

At which point we'll have the three states.

-Kees

Signature · 1 line
Kees Cook                                            @outflux.net
#2 lore raw

PATCH 1/1 Simple NX lowmem mappings

Quoted 13 lines · Kees Cook

Hi,

Thanks for starting this work!

Quoted 4 lines · Russel

-#define MT_MEMORY 9
[...]
+ MT_MEMORY,
+ MT_MEMORY_NX,

Instead of these names, let's more fully describe the protections. "NX" doesn't say anything about RO vs RW. Instead, how about:

Quoted 8 lines

MT_MEMORY_RWX (to replace MT_MEMORY) MT_MEMORY_RW (as the new "NX" in use for this patch)

for the first change? Then as we move forward, we can add:

MT_MEMORY_R

At which point we'll have the three states.

Yes, we can. We have a few others which should be changed in the same way.

#3 lore raw

PATCH 1/1 Simple NX lowmem mappings

In reply to Russell King - ARM Linux
Quoted 19 lines · Russell King - ARM Linux

This patch has similar functionality to Laura's patch set earlier this month, except I've just done the basic change - we don't increase the size of the kernel for this, so there should be no kernel size related problems with this. We mark sections which do not overlap any kernel text as non-executable.

8<====
From: Russell King <[email protected]>
ARM: Implement basic NX support for kernel lowmem mappings

Add basic NX support for kernel lowmem mappings. We mark any section which does not overlap kernel text as non-executable, preventing it from being used to write code and then execute directly from there.

This does not change the alignment of the sections, so the kernel image doesn't grow significantly via this change, so we can do this without needing a config option.

[...]

arch/arm/mm/mmu.c static void __init kmap_init(void) · line 1313

Quoted 6 lines
arch/arm/mm/mmu.c +2 -0
@@ -1294,6 +1309,8 @@ static void __init kmap_init(void)
 static void __init map_lowmem(void)
 {
 	struct memblock_region *reg;
+	unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
+	unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);

Maybe a worthwhile config option could allow for the above to be rounded to PAGE_SIZE instead. That would require a second level page table for the kernel text edges with increased TLB pressure but also with tighter protection. That would also allow removing executability of __init memory after it is discarded.

arch/arm/mm/mmu.c static void __init map_lowmem(void) · line 1326

Quoted 11 lines
arch/arm/mm/mmu.c +1 -4
 	/* Map all the lowmem memory banks. */
 	for_each_memblock(memory, reg) {
@@ -1306,12 +1323,40 @@ static void __init map_lowmem(void)
 		if (start >= end)
 			break;
 
-		map.pfn = __phys_to_pfn(start);
-		map.virtual = __phys_to_virt(start);
-		map.length = end - start;
-		map.type = MT_MEMORY;
+		if (end < kernel_x_start || start >= kernel_x_end) {

Isn't it supposed to be "end <= kernel_x_start" ?

arch/arm/mm/mmu.c static void __init map_lowmem(void) · line 1330

Quoted 4 lines
arch/arm/mm/mmu.c +4 -0
+			map.pfn = __phys_to_pfn(start);
+			map.virtual = __phys_to_virt(start);
+			map.length = end - start;
+			map.type = MT_MEMORY;

Isn't it supposed to be MT_MEMORY_NX here?

Quoted 39 lines
arch/arm/mm/mmu.c +28 -1
-		create_mapping(&map);
+			create_mapping(&map);
+		} else {
+			/* This better cover the entire kernel */
+			if (start < kernel_x_start) {
+				map.pfn = __phys_to_pfn(start);
+				map.virtual = __phys_to_virt(start);
+				map.length = kernel_x_start - start;
+				map.type = MT_MEMORY_NX;
+
+				create_mapping(&map);
+			}
+
+			map.pfn = __phys_to_pfn(kernel_x_start);
+			map.virtual = __phys_to_virt(kernel_x_start);
+			map.length = kernel_x_end - kernel_x_start;
+			map.type = MT_MEMORY;
+
+			create_mapping(&map);
+
+			if (kernel_x_end < end) {
+				map.pfn = __phys_to_pfn(kernel_x_end);
+				map.virtual = __phys_to_virt(kernel_x_end);
+				map.length = end - kernel_x_end;
+				map.type = MT_MEMORY_NX;
+
+				create_mapping(&map);
+			}
+		}
 	}
 }
 
 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel