From: Shuah Khan <shuah.kh@samsung.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: len.brown@intel.com, pavel@ucw.cz, rjw@rjwysocki.net,
gregkh@linuxfoundation.org, anton@enomsg.org,
dwmw2@infradead.org, fweisbec@gmail.com, mingo@redhat.com,
keun-o.park@windriver.com, paul.gortmaker@windriver.com,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
shuahkhan@gmail.com, stable@vger.kernel.org,
Shuah Khan <shuah.kh@samsung.com>
Subject: Re: [PATCH 2/2] PM: Fix Oops from NULL pointer dereference in wakeup_source_activate
Date: Thu, 21 Nov 2013 11:02:02 -0700 [thread overview]
Message-ID: <528E4A9A.2060908@samsung.com> (raw)
In-Reply-To: <20131120212656.1df4515e@gandalf.local.home>
On 11/20/2013 07:26 PM, Steven Rostedt wrote:
> On Wed, 20 Nov 2013 19:01:22 -0700
> Shuah Khan <shuah.kh@samsung.com> 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@samsung.com | (970) 672-0658
prev parent reply other threads:[~2013-11-21 18:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 1:40 [PATCH 0/2] power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate Shuah Khan
2013-11-21 1:40 ` [PATCH 1/2] " Shuah Khan
2013-11-21 1:40 ` [PATCH 2/2] PM: Fix Oops from NULL pointer dereference in wakeup_source_activate Shuah Khan
2013-11-21 2:01 ` Shuah Khan
2013-11-21 2:26 ` Steven Rostedt
2013-11-21 18:02 ` Shuah Khan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=528E4A9A.2060908@samsung.com \
--to=shuah.kh@samsung.com \
--cc=anton@enomsg.org \
--cc=dwmw2@infradead.org \
--cc=fweisbec@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=keun-o.park@windriver.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paul.gortmaker@windriver.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=rostedt@goodmis.org \
--cc=shuahkhan@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox