x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases
STRICT_DEVMEM and PAT produce same failure accessing /dev/mem, which is quite confusing to the user. Make printk messages different to lessen confusion. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Родитель
1db491f77b
Коммит
1f40a8bfa9
|
@ -610,7 +610,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_STRICT_DEVMEM
|
#ifdef CONFIG_STRICT_DEVMEM
|
||||||
/* This check is done in drivers/char/mem.c in case of STRICT_DEVMEM*/
|
/* This check is done in drivers/char/mem.c in case of STRICT_DEVMEM */
|
||||||
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
||||||
|
|
||||||
while (cursor < to) {
|
while (cursor < to) {
|
||||||
if (!devmem_is_allowed(pfn)) {
|
if (!devmem_is_allowed(pfn)) {
|
||||||
printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
|
printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
|
||||||
current->comm, from, to - 1);
|
current->comm, from, to - 1);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
cursor += PAGE_SIZE;
|
cursor += PAGE_SIZE;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче