Commit e46daee5 authored by Kees Cook's avatar Kees Cook Committed by Russell King
Browse files

ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE

The arm compiler internally interprets an inline assembly label
as an unsigned long value, not a pointer. As a result, under
CONFIG_FORTIFY_SOURCE, the address of a label has a size of 4 bytes,
which was tripping the runtime checks. Instead, we can just cast the label
(as done with the size calculations earlier).


Reported-by: default avatarWilliam Cohen <>
Fixes: 6974f0c4

 ("include/linux/string.h: add the option of fortified string.h functions")
Acked-by: default avatarLaura Abbott <>
Acked-by: default avatarMasami Hiramatsu <>
Tested-by: default avatarWilliam Cohen <>
Signed-off-by: default avatarKees Cook <>
Signed-off-by: default avatarRussell King <>
parent 65102238
......@@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or
/* Copy arch-dep-instance from template. */
memcpy(code, &optprobe_template_entry,
memcpy(code, (unsigned char *)optprobe_template_entry,
TMPL_END_IDX * sizeof(kprobe_opcode_t));
/* Adjust buffer according to instruction. */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment