Commit 090b39af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v5.19-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull kernel hardening fix from Kees Cook:
 "This fixes an unlucky build race condition when using the GCC plugins,
  noticed by a few folks.

   - Avoid GCC plugins needing utsrelease.h build target (Masahiro Yamada)"

* tag 'hardening-v5.19-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  gcc-plugins: use KERNELVERSION for plugin version
parents 6d29d7fe d37aa2ef

scripts/gcc-plugins/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) 


plugin_cxxflags	= -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \

		  -include $(srctree)/include/linux/compiler-version.h \

		  -include $(objtree)/include/generated/utsrelease.h \

		  -DPLUGIN_VERSION=$(call stringify,$(KERNELVERSION)) \

		  -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \

		  -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \

		  -ggdb -Wno-narrowing -Wno-unused-variable \

scripts/gcc-plugins/latent_entropy_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ __visible int plugin_is_GPL_compatible; 
static GTY(()) tree latent_entropy_decl;



static struct plugin_info latent_entropy_plugin_info = {

	.version	= UTS_RELEASE,

	.version	= PLUGIN_VERSION,

	.help		= "disable\tturn off latent entropy instrumentation\n",

};

scripts/gcc-plugins/randomize_layout_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ __visible int plugin_is_GPL_compatible; 
static int performance_mode;



static struct plugin_info randomize_layout_plugin_info = {

	.version	= UTS_RELEASE,

	.version	= PLUGIN_VERSION,

	.help		= "disable\t\t\tdo not activate plugin\n"

			  "performance-mode\tenable cacheline-aware layout randomization\n"

};

scripts/gcc-plugins/sancov_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ __visible int plugin_is_GPL_compatible; 
tree sancov_fndecl;



static struct plugin_info sancov_plugin_info = {

	.version	= UTS_RELEASE,

	.version	= PLUGIN_VERSION,

	.help		= "sancov plugin\n",

};

scripts/gcc-plugins/stackleak_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static bool verbose = false; 
static GTY(()) tree track_function_decl;



static struct plugin_info stackleak_plugin_info = {

	.version = UTS_RELEASE,

	.version = PLUGIN_VERSION,

	.help = "track-min-size=nn\ttrack stack for functions with a stack frame size >= nn bytes\n"

		"arch=target_arch\tspecify target build arch\n"

		"disable\t\tdo not activate the plugin\n"