From: Shuah Khan <shuah.kh@samsung.com>
To: len.brown@intel.com, pavel@ucw.cz, rjw@rjwysocki.net,
gregkh@linuxfoundation.org, anton@enomsg.org,
dwmw2@infradead.org
Cc: Shuah Khan <shuah.kh@samsung.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
shuahkhan@gmail.com
Subject: [PATCH 0/2] power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate
Date: Wed, 20 Nov 2013 18:40:48 -0700 [thread overview]
Message-ID: <cover.1384990612.git.shuah.kh@samsung.com> (raw)
power_supply_register() calls device_init_wakeup() to register a wakeup
source before initializing dev_name. As a result, device_wakeup_enable()
end up registering wakeup source with a null name when wakeup_source_register()
gets called with dev_name(dev) which is null at the time.
device_wakeup_enable() uses dev_name(dev) as the wakeup source name.
When it gets called with a device with its name not yet set, ws structure
with ws->name = NULL gets created.
When kernel is booted with wakeup_source_activate enabled, it will panic
when the trace point code tries to dereference ws->name. Registering a
a wakeup source without a name should be possible.
This patch series fixes power_supply_register() to initialize the device name
prior to calling device_init_wakeup() and fixes wakeup_source_activate
tracepoint to check for null name and handle it gracefully by just using
"(no name)" as the name string for the source.
These two patches are not dependent, I left them as a series since the original
discussion started the fixes grouped in a series.
power_supply patch - no changes since series patch v1, other than including
Acked-by from Greg and Anton. Also added stable tag.
Second patch now is the fix to tracepoint code. This fix is definitely better
than adding WARN_ON to device_wakeup_enable(). It removes the dependency
between these two patches.
These patches can be applied independently with no ill effects. I included
the trace for the wakeup_source_activate trace output in the changelogs for
both patches.
Shuah Khan (2):
power_supply: Fix Oops from NULL pointer dereference from
wakeup_source_activate
PM: Fix Oops from NULL pointer dereference in wakeup_source_activate
drivers/power/power_supply_core.c | 12 ++++++------
include/trace/events/power.h | 6 ++++--
2 files changed, 10 insertions(+), 8 deletions(-)
--
1.8.3.2
next reply other threads:[~2013-11-21 1:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 1:40 Shuah Khan [this message]
2013-11-21 1:40 ` [PATCH 1/2] power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate 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
-- strict thread matches above, loose matches on Subject: below --
2013-11-19 15:59 [PATCH 0/2] power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate Shuah Khan
2013-11-19 21:11 ` Anton Vorontsov
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=cover.1384990612.git.shuah.kh@samsung.com \
--to=shuah.kh@samsung.com \
--cc=anton@enomsg.org \
--cc=dwmw2@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=shuahkhan@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).