Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1c12bc authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google) Committed by Greg Kroah-Hartman
Browse files

error-injection: Add prompt for function error injection 



commit a4412fdd49dc011bcc2c0d81ac4cab7457092650 upstream.

The config to be able to inject error codes into any function annotated
with ALLOW_ERROR_INJECTION() is enabled when FUNCTION_ERROR_INJECTION is
enabled.  But unfortunately, this is always enabled on x86 when KPROBES
is enabled, and there's no way to turn it off.

As kprobes is useful for observability of the kernel, it is useful to
have it enabled in production environments.  But error injection should
be avoided.  Add a prompt to the config to allow it to be disabled even
when kprobes is enabled, and get rid of the "def_bool y".

This is a kernel debug feature (it's in Kconfig.debug), and should have
never been something enabled by default.

Cc: stable@vger.kernel.org
Fixes: 540adea3 ("error-injection: Separate error-injection from kprobe")
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f6fd2de

lib/Kconfig.debug

+7 −1
Original line number Diff line number Diff line
@@ -1525,8 +1525,14 @@ config NETDEV_NOTIFIER_ERROR_INJECT 
	  If unsure, say N.



config FUNCTION_ERROR_INJECTION

	def_bool y

	bool "Fault-injections of functions"

	depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES

	help

	  Add fault injections into various functions that are annotated with

	  ALLOW_ERROR_INJECTION() in the kernel. BPF may also modify the return

	  value of theses functions. This is useful to test error paths of code.



	  If unsure, say N



config FAULT_INJECTION

	bool "Fault-injection framework"