diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2012-03-23 01:08:34 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-03-26 15:45:32 -0400 |
| commit | 41603e9783a24c8c7cce548c0819bdc9e46a585b (patch) | |
| tree | d309d27fd11f922cb20cab809ac3db9096ff2377 /drivers | |
| parent | a979e2e2af7d5b4bb3b20f6a716c627bb23a6753 (diff) | |
| download | lwn-41603e9783a24c8c7cce548c0819bdc9e46a585b.tar.gz lwn-41603e9783a24c8c7cce548c0819bdc9e46a585b.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/amilo-rfkill.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c index 19170bb7700b..a514bf66fdd7 100644 --- a/drivers/platform/x86/amilo-rfkill.c +++ b/drivers/platform/x86/amilo-rfkill.c @@ -97,9 +97,12 @@ static struct rfkill *amilo_rfkill_dev; static int __devinit amilo_rfkill_probe(struct platform_device *device) { + int rc; const struct dmi_system_id *system_id = dmi_first_match(amilo_rfkill_id_table); - int rc; + + if (!system_id) + return -ENXIO; amilo_rfkill_dev = rfkill_alloc(KBUILD_MODNAME, &device->dev, RFKILL_TYPE_WLAN, |