Commit b8661450 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

lkdtm: Add kernel version to failure hints 



In an effort to keep as much information in once place as possible in
CI logs, report the kernel version and architecture in the failure hints.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: kernelci@groups.io
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210818174855.2307828-4-keescook@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe8e353b

drivers/misc/lkdtm/lkdtm.h

+12 −8
Original line number Diff line number Diff line
@@ -5,13 +5,17 @@ 
#define pr_fmt(fmt) "lkdtm: " fmt



#include <linux/kernel.h>

#include <generated/compile.h>

#include <generated/utsrelease.h>



#define LKDTM_KERNEL "kernel (" UTS_RELEASE " " UTS_MACHINE ")"



#define pr_expected_config(kconfig)				\

{								\

	if (IS_ENABLED(kconfig)) 				\

		pr_err("Unexpected! This kernel was built with " #kconfig "=y\n"); \

		pr_err("Unexpected! This " LKDTM_KERNEL " was built with " #kconfig "=y\n"); \

	else							\

		pr_warn("This is probably expected, since this kernel was built *without* " #kconfig "=y\n"); \

		pr_warn("This is probably expected, since this " LKDTM_KERNEL " was built *without* " #kconfig "=y\n"); \

}



#ifndef MODULE
@@ -21,24 +25,24 @@ int lkdtm_check_bool_cmdline(const char *param); 
	if (IS_ENABLED(kconfig)) {				\

		switch (lkdtm_check_bool_cmdline(param)) {	\

		case 0:						\

			pr_warn("This is probably expected, since this kernel was built with " #kconfig "=y but booted with '" param "=N'\n"); \

			pr_warn("This is probably expected, since this " LKDTM_KERNEL " was built with " #kconfig "=y but booted with '" param "=N'\n"); \

			break;					\

		case 1:						\

			pr_err("Unexpected! This kernel was built with " #kconfig "=y and booted with '" param "=Y'\n"); \

			pr_err("Unexpected! This " LKDTM_KERNEL " was built with " #kconfig "=y and booted with '" param "=Y'\n"); \

			break;					\

		default:					\

			pr_err("Unexpected! This kernel was built with " #kconfig "=y (and booted without '" param "' specified)\n"); \

			pr_err("Unexpected! This " LKDTM_KERNEL " was built with " #kconfig "=y (and booted without '" param "' specified)\n"); \

		}						\

	} else {						\

		switch (lkdtm_check_bool_cmdline(param)) {	\

		case 0:						\

			pr_warn("This is probably expected, as kernel was built *without* " #kconfig "=y and booted with '" param "=N'\n"); \

			pr_warn("This is probably expected, as this " LKDTM_KERNEL " was built *without* " #kconfig "=y and booted with '" param "=N'\n"); \

			break;					\

		case 1:						\

			pr_err("Unexpected! This kernel was built *without* " #kconfig "=y but booted with '" param "=Y'\n"); \

			pr_err("Unexpected! This " LKDTM_KERNEL " was built *without* " #kconfig "=y but booted with '" param "=Y'\n"); \

			break;					\

		default:					\

			pr_err("This is probably expected, since this kernel was built *without* " #kconfig "=y (and booted without '" param "' specified)\n"); \

			pr_err("This is probably expected, since this " LKDTM_KERNEL " was built *without* " #kconfig "=y (and booted without '" param "' specified)\n"); \

			break;					\

		}						\

	}							\