Re: [PATCH 2/2] PM: Fix Oops from NULL pointer dereference in wakeup_source_activate

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11/20/2013 07:26 PM, Steven Rostedt wrote:
On Wed, 20 Nov 2013 19:01:22 -0700
Shuah Khan <shuah.kh@xxxxxxxxxxx> wrote:

On 11/20/2013 06:40 PM, Shuah Khan wrote:

---
   include/trace/events/power.h | 6 ++++--
   1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index cda100d..5ba545a 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -110,12 +110,14 @@ DECLARE_EVENT_CLASS(wakeup_source,
   	TP_ARGS(name, state),

   	TP_STRUCT__entry(
-		__string(       name,           name            )
+		__string(name,  name ? name : "(no name)")
   		__field(        u64,            state           )
   	),

   	TP_fast_assign(
-		__assign_str(name, name);
+		const char *tname = name ? name : "(no name)";
+
+		__assign_str(name, tname);
   		__entry->state = state;
   	),



Adding tracing maintainers.

Thanks!

This is one solution, but what about just making the tracing facility a
bit more robust for everyone. Following what glibc printf() does when
it is passed a NULL, does this patch fix it too?


Why not? I am working to get the code compiling now. Will let you know if this works.

-- Shuah


--
Shuah Khan
Senior Linux Kernel Developer - Open Source Group
Samsung Research America(Silicon Valley)
shuah.kh@xxxxxxxxxxx | (970) 672-0658
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]