leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'gcc-plugins-v4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Browse Source 
Pull gcc stackleak plugin fixes from Kees Cook:

 - Remove tracing for inserted stack depth marking function (Anders
   Roxell)

 - Move gcc-plugin pass location to avoid objtool warnings (Alexander
   Popov)

* tag 'gcc-plugins-v4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  stackleak: Register the 'stackleak_cleanup' pass before the '*free_cfg' pass
  stackleak: Mark stackleak_track_stack() as notrace
This commit is contained in:
Linus Torvalds
2018-12-07 13:13:07 -08:00
parent 52ab2ec005 8fb2dfb228
commit 1cdc3624a1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/stackleak.c
View File

@@ -104,7 +104,7 @@ asmlinkage void notrace stackleak_erase(void)
} }
NOKPROBE_SYMBOL(stackleak_erase); NOKPROBE_SYMBOL(stackleak_erase);
void __used stackleak_track_stack(void) void __used notrace stackleak_track_stack(void)
{ {
/* /*
* N.B. stackleak_erase() fills the kernel stack with the poison value, * N.B. stackleak_erase() fills the kernel stack with the poison value,

8
scripts/gcc-plugins/stackleak_plugin.c
View File

@@ -363,10 +363,12 @@ __visible int plugin_init(struct plugin_name_args *plugin_info,
PASS_POS_INSERT_BEFORE); PASS_POS_INSERT_BEFORE);
/* /*
* The stackleak_cleanup pass should be executed after the * The stackleak_cleanup pass should be executed before the "*free_cfg"
* "reload" pass, when the stack frame size is final. * pass. It's the moment when the stack frame size is already final,
* function prologues and epilogues are generated, and the
* machine-dependent code transformations are not done.
*/ */
PASS_INFO(stackleak_cleanup, "reload", 1, PASS_POS_INSERT_AFTER); PASS_INFO(stackleak_cleanup, "*free_cfg", 1, PASS_POS_INSERT_BEFORE);
if (!plugin_default_version_check(version, &gcc_version)) { if (!plugin_default_version_check(version, &gcc_version)) {
error(G_("incompatible gcc/plugin versions")); error(G_("incompatible gcc/plugin versions"));