diff options
| author | Wang Nan <wangnan0@huawei.com> | 2015-01-05 19:29:25 +0800 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-01-13 16:10:15 +0000 |
| commit | a0266c214fab21371a499e6ab1c9385cc6589189 (patch) | |
| tree | 69accee3d0fdc9ae9a0c3c683a7ed87497e61a81 /arch/arm/kernel/entry-armv.S | |
| parent | 6624cf651f1a14363d0385f36dc255d304ac7ebb (diff) | |
ARM: kprobes: disallow probing stack consuming instructions
This patch prohibits probing instructions for which the stack
requirements are unable to be determined statically. Some test cases
are found not work again after the modification, this patch also
removes them.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 2f5555d307b3..672b21942fff 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -31,6 +31,7 @@ #include "entry-header.S" #include <asm/entry-macro-multi.S> +#include <asm/probes.h> /* * Interrupt handling. @@ -249,7 +250,7 @@ __und_svc: @ If a kprobe is about to simulate a "stmdb sp..." instruction, @ it obviously needs free stack space which then will belong to @ the saved context. - svc_entry 64 + svc_entry MAX_STACK_SIZE #else svc_entry #endif |