x86 fix
Linus, please pull this x86 fix from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes2.git for-linus
Thanks,
Ingo
------------------>
Venki Pallipadi (1):
x86, PAT: disable /dev/mem mmap RAM with PAT
arch/x86/mm/pat.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
arch/x86/mm/pat.c +31 -0
@@ -16,6 +16,7 @@#include <asm/msr.h> #include <asm/tlbflush.h> #include <asm/processor.h> +#include <asm/page.h> #include <asm/pgtable.h> #include <asm/pat.h> #include <asm/e820.h>
@@ -477,6 +478,33 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,return vma_prot; } +#ifdef CONFIG_NONPROMISC_DEVMEM +/* This check is done in drivers/char/mem.c in case of NONPROMISC_DEVMEM*/ +static inline int range_is_allowed (unsigned long pfn,unsigned long size) +{ +return 1 ; +} +#else +static inline int range_is_allowed (unsigned long pfn,unsigned long size) +{ +u64 from = ((u64 )pfn) <<PAGE_SHIFT ; +u64 to = from + size; +u64 cursor = from; + +while (cursor < to) { +if (!devmem_is_allowed (pfn)) { +printk (KERN_INFO +"Program %s tried to access /dev/mem between %Lx->%Lx.\n" , + current->comm, from, to); +return 0 ; + } + cursor +=PAGE_SIZE ; + pfn++; + } +return 1 ; +} +#endif /* CONFIG_NONPROMISC_DEVMEM */ +int phys_mem_access_prot_allowed (struct file *file,unsigned long pfn,unsigned long size,pgprot_t *vma_prot) {
@@ -485,6 +513,9 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,unsigned long ret_flags;int retval; +if (!range_is_allowed (pfn, size)) +return 0 ; +if (file->f_flags &O_SYNC ) { flags = _PAGE_CACHE_UC; }
Quoted 29 lines · Ingo Molnar
Linus, please pull this x86 fix from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes2.git for-linusThanks,
Ingo
------------------>
Venki Pallipadi (1):
x86, PAT: disable/dev/memmmap RAM with PATarch/x86/mm/pat.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)arch/x86/mm/pat.c +1
-0@@ -16,6 +16,7 @@#include <asm/msr.h> #include <asm/tlbflush.h> #include <asm/processor.h> +#include <asm/page.h> #include <asm/pgtable.h> #include <asm/pat.h> #include <asm/e820.h> @@ -477,6 +478,33 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,return vma_prot;
arch/x86/mm/pat.c pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, · line 488
Quoted 10 lines
arch/x86/mm/pat.c +8
-0} +#ifdef CONFIG_NONPROMISC_DEVMEM +/* This check is done in drivers/char/mem.c in case of NONPROMISC_DEVMEM*/ +static inline int range_is_allowed (unsigned long pfn,unsigned long size) +{ +return 1 ; +} +#else +static inline int range_is_allowed (unsigned long pfn,unsigned long size)
inline? Seems a bit big to me.
Quoted 9 lines
arch/x86/mm/pat.c +9
-0+{ +u64 from = ((u64 )pfn) <<PAGE_SHIFT ; +u64 to = from + size; +u64 cursor = from; + +while (cursor < to) { +if (!devmem_is_allowed (pfn)) { + printk(KERN_INFO + "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
arch/x86/mm/pat.c pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, · line 507
Quoted 10 lines
arch/x86/mm/pat.c +10
-0+ current->comm, from, to); + return 0; + } + cursor +=PAGE_SIZE ; + pfn++; + } +return 1 ; +} +#endif /* CONFIG_NONPROMISC_DEVMEM */ +
Cheers,
Harvey