Skip to contentSkip to conversation

tracing fix

GIT PULL Frederic Weisbecker 2 participants 2 messages Jun 8, 2010 Tracing

lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the perf/urgent branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/urgent

Thanks,
Frederic
---

Oleg Nesterov (1):
tracing: Fix null pointer deref with SEND_SIG_FORCED

 include/trace/events/signal.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

---
commit b9b76dfaac6fa2c289ee8a005be637afd2da7e2f

Author: Oleg Nesterov <[email protected]>
Date:   Thu Jun 3 23:34:09 2010 +0200

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.

Cc Steven Rostedt <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Jason Baron <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc 2.6.33.x-2.6.34.x <[email protected]>

LKML-Reference: <[email protected]>

include/trace/events/signal.h +2 -1
index 814566c..17df434 100644
@@ -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) {		\
#1 lore raw
Quoted 11 lines · Frederic Weisbecker

Ingo,

Please pull the perf/urgent branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/urgent

Thanks,
Frederic
---

Quoted 6 lines

Oleg Nesterov (1):
tracing: Fix null pointer deref with SEND_SIG_FORCED

 include/trace/events/signal.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Pulled, thanks Frederic!

Ingo