From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Krzysztof Kozlowski <k.kozlowski@samsung.com>
Subject: [PATCH 3.13 93/99] power: max17040: Fix NULL pointer dereference when there is no platform_data
Date: Thu, 20 Feb 2014 15:53:28 -0800 [thread overview]
Message-ID: <20140220235120.899580780@linuxfoundation.org> (raw)
In-Reply-To: <20140220235118.191692546@linuxfoundation.org>
3.13-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
commit ac323d8d807060f7c95a685a9fe861e7b6300993 upstream.
Fix NULL pointer dereference of "chip->pdata" if platform_data was not
supplied to the driver.
The driver during probe stored the pointer to the platform_data:
chip->pdata = client->dev.platform_data;
Later it was dereferenced in max17040_get_online() and
max17040_get_status().
If platform_data was not supplied, the NULL pointer exception would
happen:
[ 6.626094] Unable to handle kernel of a at virtual address 00000000
[ 6.628557] pgd = c0004000
[ 6.632868] [00000000] *pgd=66262564
[ 6.634636] Unable to handle kernel paging request at virtual address e6262000
[ 6.642014] pgd = de468000
[ 6.644700] [e6262000] *pgd=00000000
[ 6.648265] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[ 6.653552] Modules linked in:
[ 6.656598] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted 3.10.14-02717-gc58b4b4 #505
[ 6.664334] Workqueue: events max17040_work
[ 6.668488] task: dfa11b80 ti: df9f6000 task.ti: df9f6000
[ 6.673873] PC is at show_pte+0x80/0xb8
[ 6.677687] LR is at show_pte+0x3c/0xb8
[ 6.681503] pc : [<c001b7b8>] lr : [<c001b774>] psr: 600f0113
[ 6.681503] sp : df9f7d58 ip : 600f0113 fp : 00000009
[ 6.692965] r10: 00000000 r9 : 00000000 r8 : dfa11b80
[ 6.698171] r7 : df9f7ea0 r6 : e6262000 r5 : 00000000 r4 : 00000000
[ 6.704680] r3 : 00000000 r2 : e6262000 r1 : 600f0193 r0 : c05b3750
[ 6.711194] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
[ 6.718485] Control: 10c53c7d Table: 5e46806a DAC: 00000015
[ 6.724218] Process kworker/0:1 (pid: 31, stack limit = 0xdf9f6238)
[ 6.730465] Stack: (0xdf9f7d58 to 0xdf9f8000)
[ 6.914325] [<c001b7b8>] (show_pte+0x80/0xb8) from [<c047107c>] (__do_kernel_fault.part.9+0x44/0x74)
[ 6.923425] [<c047107c>] (__do_kernel_fault.part.9+0x44/0x74) from [<c001bb7c>] (do_page_fault+0x2c4/0x360)
[ 6.933144] [<c001bb7c>] (do_page_fault+0x2c4/0x360) from [<c0008400>] (do_DataAbort+0x34/0x9c)
[ 6.941825] [<c0008400>] (do_DataAbort+0x34/0x9c) from [<c000e5d8>] (__dabt_svc+0x38/0x60)
[ 6.950058] Exception stack(0xdf9f7ea0 to 0xdf9f7ee8)
[ 6.955099] 7ea0: df0c1790 00000000 00000002 00000000 df0c1794 df0c1790 df0c1790 00000042
[ 6.963271] 7ec0: df0c1794 00000001 00000000 00000009 00000000 df9f7ee8 c0306268 c0306270
[ 6.971419] 7ee0: a00f0113 ffffffff
[ 6.974902] [<c000e5d8>] (__dabt_svc+0x38/0x60) from [<c0306270>] (max17040_work+0x8c/0x144)
[ 6.983317] [<c0306270>] (max17040_work+0x8c/0x144) from [<c003f364>] (process_one_work+0x138/0x440)
[ 6.992429] [<c003f364>] (process_one_work+0x138/0x440) from [<c003fa64>] (worker_thread+0x134/0x3b8)
[ 7.001628] [<c003fa64>] (worker_thread+0x134/0x3b8) from [<c00454bc>] (kthread+0xa4/0xb0)
[ 7.009875] [<c00454bc>] (kthread+0xa4/0xb0) from [<c000eb28>] (ret_from_fork+0x14/0x2c)
[ 7.017943] Code: e1a03005 e2422480 e0826104 e59f002c (e7922104)
[ 7.024017] ---[ end trace 73bc7006b9cc5c79 ]---
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: c6f4a42de60b981dd210de01cd3e575835e3158e
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/power/max17040_battery.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -148,7 +148,7 @@ static void max17040_get_online(struct i
{
struct max17040_chip *chip = i2c_get_clientdata(client);
- if (chip->pdata->battery_online)
+ if (chip->pdata && chip->pdata->battery_online)
chip->online = chip->pdata->battery_online();
else
chip->online = 1;
@@ -158,7 +158,8 @@ static void max17040_get_status(struct i
{
struct max17040_chip *chip = i2c_get_clientdata(client);
- if (!chip->pdata->charger_online || !chip->pdata->charger_enable) {
+ if (!chip->pdata || !chip->pdata->charger_online
+ || !chip->pdata->charger_enable) {
chip->status = POWER_SUPPLY_STATUS_UNKNOWN;
return;
}
next prev parent reply other threads:[~2014-02-20 23:55 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 23:51 [PATCH 3.13 00/99] 3.13.5-stable review Greg Kroah-Hartman
2014-02-20 23:51 ` [PATCH 3.13 01/99] xen: properly account for _PAGE_NUMA during xen pte translations Greg Kroah-Hartman
2014-02-20 23:51 ` [PATCH 3.13 02/99] xen-blkfront: handle backend CLOSED without CLOSING Greg Kroah-Hartman
2014-02-20 23:51 ` [PATCH 3.13 03/99] fs/file.c:fdtable: avoid triggering OOMs from alloc_fdmem Greg Kroah-Hartman
2014-02-20 23:51 ` [PATCH 3.13 04/99] mm: fix page leak at nfs_symlink() Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 05/99] mm/memory-failure.c: move refcount only in !MF_COUNT_INCREASED Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 07/99] CIFS: Fix SMB2 mounts so they dont try to set or get xattrs via cifs Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 08/99] Add protocol specific operation for CIFS xattrs Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 09/99] retrieving CIFS ACLs when mounted with SMB2 fails dropping session Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 10/99] mac80211: move roc cookie assignment earlier Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 11/99] mac80211: release the channel in error path in start_ap Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 12/99] mac80211: Fix IBSS disconnect Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 13/99] mac80211: fix fragmentation code, particularly for encryption Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 14/99] ath9k_htc: make ->sta_rc_update atomic for most calls Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 15/99] ath9k_htc: Do not support PowerSave by default Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 16/99] ath9k: " Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 17/99] ar5523: fix usb id for Gigaset Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 18/99] s390/dump: Fix dump memory detection Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 19/99] s390: fix kernel crash due to linkage stack instructions Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 20/99] nl80211: Reset split_start when netlink skb is exhausted Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 21/99] spi: Fix crash with double message finalisation on error handling Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 22/99] iwlwifi: mvm: dont allow A band if SKU forbids it Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 23/99] iwlwifi: mvm: disable scheduled scan Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 24/99] iwlwifi: mvm: print the version of the firmware when it asserts Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 25/99] iwlwifi: add more 7265 HW IDs Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 26/99] iwlwifi: mvm: BT Coex - disable BT when TXing probe request in scan Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 27/99] powerpc: Fix endian issues in kexec and crash dump code Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 28/99] of: fix PCI bus match for PCIe slots Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 29/99] spi: nuc900: Set SPI_LSB_FIRST for master->mode_bits if hw->pdata->lsb is true Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 30/99] serial: sirf: fix kernel panic caused by unpaired spinlock Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 31/99] raw: test against runtime value of max_raw_minors Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 32/99] hwmon: (ntc_thermistor) Avoid math overflow Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 33/99] lockd: send correct lock when granting a delayed lock Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 34/99] tty: n_gsm: Fix for modems with brk in modem status control Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 35/99] tty: Set correct tty name in active sysfs attribute Greg Kroah-Hartman
2014-02-21 14:48 ` Josh Boyer
2014-02-21 14:52 ` Hannes Reinecke
2014-02-21 14:56 ` Josh Boyer
2014-02-21 16:01 ` Kay Sievers
2014-02-21 22:53 ` Ray Strode
2014-02-22 13:25 ` David Herrmann
2014-02-22 13:40 ` Peter Hurley
2014-02-21 14:56 ` Peter Hurley
2014-02-21 16:01 ` Greg Kroah-Hartman
2014-02-21 20:21 ` Greg Kroah-Hartman
2014-02-21 22:18 ` Ray Strode
2014-02-22 15:16 ` Hannes Reinecke
2014-02-22 14:27 ` David Herrmann
2014-02-23 0:23 ` Ray Strode
[not found] ` <CAA_UwzKrqBw3o3z4LGkYfQ3H11ERKQCscdHNSjkVgHs9F117ow@mail.gmail.com>
2014-02-23 15:05 ` David Herrmann
2014-02-24 9:51 ` Hannes Reinecke
2014-02-23 14:41 ` Ray Strode
2014-02-20 23:52 ` [PATCH 3.13 36/99] n_tty: Fix stale echo output Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 37/99] drm/radeon: fix UVD IRQ support on 7xx Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 41/99] drm/i915: Pair va_copy with va_end in i915_error_vprintf Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 42/99] drm/radeon: consolidate sdma hdp flushing code for CIK Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 43/99] drm/radeon/cik: use POLL_REG_MEM special op for sDMA HDP flush Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 49/99] staging: r8188eu: Fix typo in USB_DEVICE list Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 50/99] staging: comedi: adv_pci1710: fix analog output readback value Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 51/99] staging:iio:impedance:ad5933: correct error check Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 52/99] staging:iio:ad799x fix error_free_irq which was freeing an irq that may not have been requested Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 53/99] staging:iio:ad799x fix typo in ad799x_events[] Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 54/99] iio: max1363: Use devm_regulator_get_optional for optional regulator Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 55/99] iio: adis16400: Set timestamp as the last element in chan_spec Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 56/99] iio: ak8975: Fix calculation formula for convert micro tesla to gauss unit Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 57/99] x86, smap: Dont enable SMAP if CONFIG_X86_SMAP is disabled Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 58/99] x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 59/99] ftrace/x86: Use breakpoints for converting function graph caller Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 60/99] ALSA: hda - Add a headset quirk for Dell XPS 13 Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 61/99] ALSA: hda - Fix mic capture on Sony VAIO Pro 11 Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 62/99] mei: clear write cb from waiting list on reset Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 63/99] mei: dont unset read cb ptr " Greg Kroah-Hartman
2014-02-20 23:52 ` [PATCH 3.13 64/99] VME: Correct read/write alignment algorithm Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 65/99] Drivers: hv: vmbus: Specify the target CPU that should receive notification Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 66/99] Drivers: hv: vmbus: Dont timeout during the initial connection with host Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 68/99] USB: ftdi_sio: add Tagsys RFID Reader IDs Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 69/99] usb-storage: add unusual-devs entry for BlackBerry 9000 Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 70/99] usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 71/99] usb-storage: enable multi-LUN scanning when needed Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 72/99] usb: option: blacklist ZTE MF667 net interface Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 75/99] Revert "xhci: Set scatter-gather limit to avoid failed block writes." Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 76/99] Revert "xhci: Avoid infinite loop when sg urb requires too many trbs" Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 77/99] Revert "usb: xhci: Link TRB must not occur within a USB payload burst" Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 78/99] Revert "usbcore: set lpm_capable field for LPM capable root hubs" Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 79/99] Modpost: fixed USB alias generation for ranges including 0x9 and 0xA Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 80/99] block: __elv_next_request() shouldnt call into the elevator if bypassing Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 81/99] block: Fix nr_vecs for inline integrity vectors Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 82/99] block: add cond_resched() to potentially long running ioctl discard loop Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 83/99] ACPI / hotplug / PCI: Relax the checking of _STA return values Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 84/99] compiler/gcc4: Make quirk for asm_volatile_goto() unconditional Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 85/99] misc: mic: fix possible signed underflow (undefined behavior) in userspace API Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 86/99] IB/qib: Add missing serdes init sequence Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 87/99] KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio() Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 88/99] tick: Clear broadcast pending bit when switching to oneshot Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 89/99] md/raid1: restore ability for check and repair to fix read errors Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 90/99] md/raid5: Fix CPU hotplug callback registration Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 91/99] i2c: mv64xxx: refactor message start to ensure proper initialization Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 92/99] time: Fix overflow when HZ is smaller than 60 Greg Kroah-Hartman
2014-02-20 23:53 ` Greg Kroah-Hartman [this message]
2014-02-20 23:53 ` [PATCH 3.13 94/99] ring-buffer: Fix first commit on sub-buffer having non-zero delta Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 95/99] target: Fix free-after-use regression in PR unregister Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 96/99] genirq: Add missing irq_to_desc export for CONFIG_SPARSE_IRQ=n Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 97/99] drivers/edac/edac_mc_sysfs.c: poll timeout cannot be zero Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 98/99] EDAC: Poll timeout cannot be zero, p2 Greg Kroah-Hartman
2014-02-20 23:53 ` [PATCH 3.13 99/99] EDAC: Correct workqueue setup path Greg Kroah-Hartman
2014-02-21 5:03 ` [PATCH 3.13 00/99] 3.13.5-stable review Guenter Roeck
2014-02-21 23:42 ` Shuah Khan
2014-02-22 1:50 ` Satoru Takeuchi
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=20140220235120.899580780@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).