tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

error-injection: Add prompt for function error injection

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: 540adea3809f6 ("error-injection: Separate error-injection from kprobe")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Steven Rostedt (Google) and committed by
Linus Torvalds a4412fdd 355479c7

+7 -1
+7 -1
lib/Kconfig.debug
··· 1874 1874 If unsure, say N. 1875 1875 1876 1876 config FUNCTION_ERROR_INJECTION 1877 - def_bool y 1877 + bool "Fault-injections of functions" 1878 1878 depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES 1879 + help 1880 + Add fault injections into various functions that are annotated with 1881 + ALLOW_ERROR_INJECTION() in the kernel. BPF may also modify the return 1882 + value of theses functions. This is useful to test error paths of code. 1883 + 1884 + If unsure, say N 1879 1885 1880 1886 config FAULT_INJECTION 1881 1887 bool "Fault-injection framework"