|
@@ -19,7 +19,9 @@
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/seq_file.h>
|
|
|
#include <linux/highmem.h>
|
|
|
+#include <linux/pci.h>
|
|
|
|
|
|
+#include <asm/e820/types.h>
|
|
|
#include <asm/pgtable.h>
|
|
|
|
|
|
/*
|
|
@@ -241,6 +243,29 @@ static unsigned long normalize_addr(unsigned long u)
|
|
|
return (signed long)(u << shift) >> shift;
|
|
|
}
|
|
|
|
|
|
+static void note_wx(struct pg_state *st)
|
|
|
+{
|
|
|
+ unsigned long npages;
|
|
|
+
|
|
|
+ npages = (st->current_address - st->start_address) / PAGE_SIZE;
|
|
|
+
|
|
|
+#ifdef CONFIG_PCI_BIOS
|
|
|
+ /*
|
|
|
+ * If PCI BIOS is enabled, the PCI BIOS area is forced to WX.
|
|
|
+ * Inform about it, but avoid the warning.
|
|
|
+ */
|
|
|
+ if (pcibios_enabled && st->start_address >= PAGE_OFFSET + BIOS_BEGIN &&
|
|
|
+ st->current_address <= PAGE_OFFSET + BIOS_END) {
|
|
|
+ pr_warn_once("x86/mm: PCI BIOS W+X mapping %lu pages\n", npages);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+#endif
|
|
|
+ /* Account the WX pages */
|
|
|
+ st->wx_pages += npages;
|
|
|
+ WARN_ONCE(1, "x86/mm: Found insecure W+X mapping at address %pS\n",
|
|
|
+ (void *)st->start_address);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* This function gets called on a break in a continuous series
|
|
|
* of PTE entries; the next one is different so we need to
|
|
@@ -276,14 +301,8 @@ static void note_page(struct seq_file *m, struct pg_state *st,
|
|
|
unsigned long delta;
|
|
|
int width = sizeof(unsigned long) * 2;
|
|
|
|
|
|
- if (st->check_wx && (eff & _PAGE_RW) && !(eff & _PAGE_NX)) {
|
|
|
- WARN_ONCE(1,
|
|
|
- "x86/mm: Found insecure W+X mapping at address %p/%pS\n",
|
|
|
- (void *)st->start_address,
|
|
|
- (void *)st->start_address);
|
|
|
- st->wx_pages += (st->current_address -
|
|
|
- st->start_address) / PAGE_SIZE;
|
|
|
- }
|
|
|
+ if (st->check_wx && (eff & _PAGE_RW) && !(eff & _PAGE_NX))
|
|
|
+ note_wx(st);
|
|
|
|
|
|
/*
|
|
|
* Now print the actual finished series
|