x86: rename CONFIG_NONPROMISC_DEVMEM to CONFIG_PROMISC_DEVMEM
Linus observed: > The real bug is that we shouldn't have "double negatives", and > certainly not negative config options. Making that "promiscuous > /dev/mem" option a negated thing as a config option was bad. right ... lets rename this option. There should never be a negation in config options. [ that reminds me of CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER, but that is for another commit ;-) ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
2567d71cc7
Коммит
64d206d896
|
@ -5,10 +5,11 @@ config TRACE_IRQFLAGS_SUPPORT
|
|||
|
||||
source "lib/Kconfig.debug"
|
||||
|
||||
config NONPROMISC_DEVMEM
|
||||
bool "Filter access to /dev/mem"
|
||||
config PROMISC_DEVMEM
|
||||
bool "Allow unlimited access to /dev/mem"
|
||||
default y
|
||||
help
|
||||
If this option is left off, you allow userspace access to all
|
||||
If this option is left on, you allow userspace (root) access to all
|
||||
of memory, including kernel and userspace memory. Accidental
|
||||
access to this is obviously disastrous, but specific access can
|
||||
be used by people debugging the kernel.
|
||||
|
|
|
@ -373,8 +373,8 @@ 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*/
|
||||
#ifndef CONFIG_PROMISC_DEVMEM
|
||||
/* This check is done in drivers/char/mem.c in case of !PROMISC_DEVMEM*/
|
||||
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
||||
{
|
||||
return 1;
|
||||
|
@ -398,7 +398,7 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
|||
}
|
||||
return 1;
|
||||
}
|
||||
#endif /* CONFIG_NONPROMISC_DEVMEM */
|
||||
#endif /* CONFIG_PROMISC_DEVMEM */
|
||||
|
||||
int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
|
||||
unsigned long size, pgprot_t *vma_prot)
|
||||
|
|
|
@ -80,7 +80,7 @@ static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NONPROMISC_DEVMEM
|
||||
#ifndef CONFIG_PROMISC_DEVMEM
|
||||
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
|
||||
{
|
||||
u64 from = ((u64)pfn) << PAGE_SHIFT;
|
||||
|
|
Загрузка…
Ссылка в новой задаче