The quilt patch titled Subject: error-injection: add prompt for function error injection has been removed from the -mm tree. Its filename was error-injection-add-prompt-for-function-error-injection.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------ From: "Steven Rostedt (Google)" rostedt@goodmis.org Subject: error-injection: add prompt for function error injection Date: Mon, 21 Nov 2022 10:44:03 -0500

The config to be able to inject error codes into any function annotated with ALLOW_ERROR_INJECTION() is enabled when CONFIG_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.

Link: https://lkml.kernel.org/r/20221121104403.1545f9b5@gandalf.local.home Fixes: 540adea3809f6 ("error-injection: Separate error-injection from kprobe") Signed-off-by: Steven Rostedt (Google) rostedt@goodmis.org Acked-by: Borislav Petkov bp@suse.de Acked-by: Masami Hiramatsu (Google) mhiramat@kernel.org Cc: Alexei Starovoitov alexei.starovoitov@gmail.com Cc: Christoph Hellwig hch@infradead.org Cc: Florent Revest revest@chromium.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Cc: Josh Poimboeuf jpoimboe@redhat.com Cc: Kees Cook keescook@chromium.org Cc: KP Singh kpsingh@kernel.org Cc: Mark Rutland mark.rutland@arm.com Cc: Peter Zijlstra peterz@infradead.org Cc: stable@vger.kernel.org Signed-off-by: Andrew Morton akpm@linux-foundation.org ---

lib/Kconfig.debug | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

--- a/lib/Kconfig.debug~error-injection-add-prompt-for-function-error-injection +++ a/lib/Kconfig.debug @@ -1875,8 +1875,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" _

Patches currently in -mm which might be from rostedt@goodmis.org are