Commit 045f6d79 authored by Changbin Du's avatar Changbin Du Committed by Linus Torvalds
Browse files

lib/Kconfig.debug: fix some messed up configurations 

Some configuration items are messed up during conflict resolving.  For
example, STRICT_DEVMEM should not in testing menu, but kunit should.
This patch fixes all of them.

[akpm@linux-foundation.org: coding style fixes]
Link: http://lkml.kernel.org/r/20191209155653.7509-1-changbin.du@gmail.com


Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42a9a53b

lib/Kconfig.debug

+51 −49
Original line number Diff line number Diff line
@@ -1483,6 +1483,55 @@ config PROVIDE_OHCI1394_DMA_INIT 


	  See Documentation/debugging-via-ohci1394.txt for more information.



source "samples/Kconfig"



config ARCH_HAS_DEVMEM_IS_ALLOWED

	bool



config STRICT_DEVMEM

	bool "Filter access to /dev/mem"

	depends on MMU && DEVMEM

	depends on ARCH_HAS_DEVMEM_IS_ALLOWED

	default y if PPC || X86 || ARM64

	help

	  If this option is disabled, 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. Note that with PAT support

	  enabled, even in this case there are restrictions on /dev/mem

	  use due to the cache aliasing requirements.



	  If this option is switched on, and IO_STRICT_DEVMEM=n, the /dev/mem

	  file only allows userspace access to PCI space and the BIOS code and

	  data regions.  This is sufficient for dosemu and X and all common

	  users of /dev/mem.



	  If in doubt, say Y.



config IO_STRICT_DEVMEM

	bool "Filter I/O access to /dev/mem"

	depends on STRICT_DEVMEM

	help

	  If this option is disabled, you allow userspace (root) access to all

	  io-memory regardless of whether a driver is actively using that

	  range.  Accidental access to this is obviously disastrous, but

	  specific access can be used by people debugging kernel drivers.



	  If this option is switched on, the /dev/mem file only allows

	  userspace access to *idle* io-memory ranges (see /proc/iomem) This

	  may break traditional users of /dev/mem (dosemu, legacy X, etc...)

	  if the driver using a given range cannot be disabled.



	  If in doubt, say Y.



menu "$(SRCARCH) Debugging"



source "arch/$(SRCARCH)/Kconfig.debug"



endmenu



menu "Kernel Testing and Coverage"



source "lib/kunit/Kconfig"



config NOTIFIER_ERROR_INJECTION
@@ -1643,10 +1692,6 @@ config FAULT_INJECTION_STACKTRACE_FILTER 
	help

	  Provide stacktrace filter for fault-injection capabilities



endmenu # "Kernel Testing and Coverage"



menu "Kernel Testing and Coverage"



config ARCH_HAS_KCOV

	bool

	help
@@ -2130,52 +2175,7 @@ config MEMTEST 
	        memtest=17, mean do 17 test patterns.

	  If you are unsure how to answer this question, answer N.



source "samples/Kconfig"



config ARCH_HAS_DEVMEM_IS_ALLOWED

	bool



config STRICT_DEVMEM

	bool "Filter access to /dev/mem"

	depends on MMU && DEVMEM

	depends on ARCH_HAS_DEVMEM_IS_ALLOWED

	default y if PPC || X86 || ARM64

	---help---

	  If this option is disabled, 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. Note that with PAT support

	  enabled, even in this case there are restrictions on /dev/mem

	  use due to the cache aliasing requirements.



	  If this option is switched on, and IO_STRICT_DEVMEM=n, the /dev/mem

	  file only allows userspace access to PCI space and the BIOS code and

	  data regions.  This is sufficient for dosemu and X and all common

	  users of /dev/mem.



	  If in doubt, say Y.



config IO_STRICT_DEVMEM

	bool "Filter I/O access to /dev/mem"

	depends on STRICT_DEVMEM

	---help---

	  If this option is disabled, you allow userspace (root) access to all

	  io-memory regardless of whether a driver is actively using that

	  range.  Accidental access to this is obviously disastrous, but

	  specific access can be used by people debugging kernel drivers.



	  If this option is switched on, the /dev/mem file only allows

	  userspace access to *idle* io-memory ranges (see /proc/iomem) This

	  may break traditional users of /dev/mem (dosemu, legacy X, etc...)

	  if the driver using a given range cannot be disabled.



	  If in doubt, say Y.



menu "$(SRCARCH) Debugging"



source "arch/$(SRCARCH)/Kconfig.debug"



endmenu



config HYPERV_TESTING

	bool "Microsoft Hyper-V driver testing"
@@ -2184,4 +2184,6 @@ config HYPERV_TESTING 
	help

	  Select this option to enable Hyper-V vmbus testing.



endmenu # "Kernel Testing and Coverage"



endmenu # Kernel hacking

CRA Git | Maintained and supported by SUSTech CRA and CCSE