openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref 

In drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() the call
to dmi_first_match() may fail and return NULL. If it does return NULL,
then we'll be dereferencing a NULL pointer in the rfkill_alloc() call
where we do 'system_id->driver_data' --> KABOOM!

Avoid that problem by testing for a NULL return value from
dmi_first_match() and bailing out if it fails.

I was a bit uncertain about what to return in the failure case. In the
end I settled for -ENXIO as the most logical error to return.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Jesper Juhl 2012-03-23 01:08:34 +01:00 committed by Matthew Garrett
parent a979e2e2af
commit 41603e9783
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/platform/x86/amilo-rfkill.c
View File

@ -97,9 +97,12 @@ static struct rfkill *amilo_rfkill_dev;
static int __devinit amilo_rfkill_probe(struct platform_device *device) static int __devinit amilo_rfkill_probe(struct platform_device *device)
{ {
int rc;
const struct dmi_system_id *system_id = const struct dmi_system_id *system_id =
dmi_first_match(amilo_rfkill_id_table); dmi_first_match(amilo_rfkill_id_table);
int rc;
if (!system_id)
return -ENXIO;
amilo_rfkill_dev = rfkill_alloc(KBUILD_MODNAME, &device->dev, amilo_rfkill_dev = rfkill_alloc(KBUILD_MODNAME, &device->dev,
RFKILL_TYPE_WLAN, RFKILL_TYPE_WLAN,