Skip to content

power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate

Shuah Khan lkml stable 2 versions – Applied

Status from this message: Applied, thanks a lot!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest2 patches 4 repliesApplied
  2. v12 patches 3 repliesSuperseded

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/2power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activatedrivers/power/power_supply_core.c+6 -61 reply
2/2tracing: Fix Oops from NULL pointer dereference from __assign_strinclude/trace/ftrace.h+5 -23 replies

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchAnton VorontsovGreg Kroah-HartmanRafael J. Wysocki
1/2A-b A-b
2/2A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/2] power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate

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 tracing infrastructure to be more robust in handling null strings in __assign_string() and __string(). With this change null string is handled gracefully and replacing it with "(null)" when trace is generated.

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 infrastructure routines __assign_string() and __string(). This will address the problem at the tracing infrastructure level which is better than fixing individual tracepoint code.

These patches can be applied independently with no ill effects. I included the trace for the wakeup_source_activate trace output in the change logs for both patches.

Shuah Khan (2):
power_supply: Fix Oops from NULL pointer dereference from
wakeup_source_activate
tracing: Fix Oops from NULL pointer dereference from __assign_str

 drivers/power/power_supply_core.c | 12 ++++++------
 include/trace/ftrace.h            |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)
Signature · 1 line
1.8.3.2