aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2010-06-03 23:34:09 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-06-08 23:51:32 +0200
commitb9b76dfaac6fa2c289ee8a005be637afd2da7e2f (patch)
treef6577a50c16238b480f4e3a4820ed25f8eb73e85 /include/trace
parent58cc1a9e3b11a84e66c4d3a4cc9073f2cb0ecabb (diff)
downloadmrst-s0i3-test-b9b76dfaac6fa2c289ee8a005be637afd2da7e2f.tar.gz
mrst-s0i3-test-b9b76dfaac6fa2c289ee8a005be637afd2da7e2f.tar.xz
mrst-s0i3-test-b9b76dfaac6fa2c289ee8a005be637afd2da7e2f.zip
tracing: Fix null pointer deref with SEND_SIG_FORCED
BUG: unable to handle kernel NULL pointer dereference at 0000000000000006 IP: [<ffffffff8107bd37>] ftrace_raw_event_signal_generate+0x87/0x140 TP_STORE_SIGINFO() forgets about SEND_SIG_FORCED, fix. We should probably export is_si_special() and change TP_STORE_SIGINFO() to use it in the longer term. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Roland McGrath <roland@redhat.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jason Baron <jbaron@redhat.com> Cc: Masami Hiramatsu <mhiramat@redhat.com> Cc: 2.6.33.x-2.6.34.x <stable@kernel.org> LKML-Reference: <20100603213409.GA8307@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/signal.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/signal.h b/include/trace/events/signal.h
index 814566c99d2..17df43464df 100644
--- a/include/trace/events/signal.h
+++ b/include/trace/events/signal.h
@@ -10,7 +10,8 @@
#define TP_STORE_SIGINFO(__entry, info) \
do { \
- if (info == SEND_SIG_NOINFO) { \
+ if (info == SEND_SIG_NOINFO || \
+ info == SEND_SIG_FORCED) { \
__entry->errno = 0; \
__entry->code = SI_USER; \
} else if (info == SEND_SIG_PRIV) { \