summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-08 00:13:07 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-08 00:13:07 +0300
commit1cdc3624a1df5b10519481763ec7a2b2481495ca (patch)
treef0b3a314e4c36351c4f32faa871e8c069d3c1644 /kernel
parent52ab2ec00518a164884c5670932557cd868b0193 (diff)
parent8fb2dfb228df785bbeb4d055a74402ef4b07fc25 (diff)
downloadlinux-1cdc3624a1df5b10519481763ec7a2b2481495ca.tar.xz
Merge tag 'gcc-plugins-v4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/stackleak.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stackleak.c b/kernel/stackleak.c
index 08cb57eed389..b193a59fc05b 100644
--- a/kernel/stackleak.c
+++ b/kernel/stackleak.c
@@ -104,7 +104,7 @@ asmlinkage void notrace stackleak_erase(void)
}
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,