redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drivers/platform/x86: Eliminate a NULL pointer dereference 

Give different error messages if device_enum is NULL or if its type field
has the wrong value.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression E,E1;
identifier f;
statement S1,S2,S3;
@@

if ((E == NULL && ...) || ...)
{
  ... when != if (...) S1 else S2
      when != E = E1
* E->f
  ... when any
  return ...;
}
else S3
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
hifive-unleashed-5.1
Julia Lawall 2010-05-27 18:32:15 +02:00 committed by Matthew Garrett
parent 6d96e00cef
commit 0fc8f274ae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/platform/x86/sony-laptop.c
View File

@ -1196,9 +1196,13 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
}
device_enum = (union acpi_object *) buffer.pointer;
if (!device_enum || device_enum->type != ACPI_TYPE_BUFFER) {
printk(KERN_ERR "Invalid SN06 return object 0x%.2x\n",
device_enum->type);
if (!device_enum) {
pr_err("Invalid SN06 return object\n");
goto out_no_enum;
}
if (device_enum->type != ACPI_TYPE_BUFFER) {
pr_err("Invalid SN06 return object type 0x%.2x\n",
device_enum->type);
goto out_no_enum;
}