Commit 61f60bac authored by Kees Cook's avatar Kees Cook
Browse files

gcc-plugins: Change all version strings match kernel 



It's not meaningful for the GCC plugins to track their versions separately
from the rest of the kernel. Switch all versions to the kernel version.

Fix mismatched indenting while we're at it.

Cc: linux-hardening@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 1ff29758

scripts/gcc-plugins/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +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 \

		  -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	= "201606141920vanilla",

	.version	= UTS_RELEASE,

	.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	= "201402201816vanilla",

	.version	= UTS_RELEASE,

	.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	= "20160402",

	.version	= UTS_RELEASE,

	.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 = "201707101337",

	.version = UTS_RELEASE,

	.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"