* [PATCH] platform/x86: panasonic-laptop: set pcc after null device check to avoid null pointer dereference
@ 2016-03-28 16:26 Colin King
2016-03-28 20:20 ` Harald Welte
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2016-03-28 16:26 UTC (permalink / raw)
To: Harald Welte, Darren Hart, platform-driver-x86; +Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
acpi_pcc_hotkey_remove sanity checks to see if device is null, however,
this check is performed after we have already passed device into a call
to acpi_driver_data. If device is null, then acpi_driver_data will produce
a null pointer dereference on device. The correct action is to sanity check
device, then assign pcc, then check if pcc is null.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/platform/x86/panasonic-laptop.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 3f87097..39c1ebc 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -651,9 +651,13 @@ out_hotkey:
static int acpi_pcc_hotkey_remove(struct acpi_device *device)
{
- struct pcc_acpi *pcc = acpi_driver_data(device);
+ struct pcc_acpi *pcc;
+
+ if (!device)
+ return -EINVAL;
- if (!device || !pcc)
+ pcc = acpi_driver_data(device);
+ if (!pcc)
return -EINVAL;
sysfs_remove_group(&device->dev.kobj, &pcc_attr_group);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] platform/x86: panasonic-laptop: set pcc after null device check to avoid null pointer dereference
2016-03-28 16:26 [PATCH] platform/x86: panasonic-laptop: set pcc after null device check to avoid null pointer dereference Colin King
@ 2016-03-28 20:20 ` Harald Welte
0 siblings, 0 replies; 2+ messages in thread
From: Harald Welte @ 2016-03-28 20:20 UTC (permalink / raw)
To: Colin King; +Cc: Darren Hart, platform-driver-x86, linux-kernel
On Mon, Mar 28, 2016 at 05:26:12PM +0100, Colin King wrote:
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Harald Welte <laforge@gnumonks.org>
--
- Harald Welte <laforge@gnumonks.org> http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-28 21:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-28 16:26 [PATCH] platform/x86: panasonic-laptop: set pcc after null device check to avoid null pointer dereference Colin King
2016-03-28 20:20 ` Harald Welte
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.