Browse Source

PCI / pci-label: release allocated ACPI object on error recovery path

Function dsm_get_label() leaks the returned ACPI object if
obj->package.count is not 2, so fix the possible memory leak.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Jiang Liu 11 years ago
parent
commit
54e5bb4659
1 changed files with 4 additions and 8 deletions
  1. 4 8
      drivers/pci/pci-label.c

+ 4 - 8
drivers/pci/pci-label.c

@@ -233,11 +233,7 @@ dsm_get_label(acpi_handle handle, int func,
 		return -1;
 		return -1;
 
 
 	obj = (union acpi_object *)output->pointer;
 	obj = (union acpi_object *)output->pointer;
-
-	switch (obj->type) {
-	case ACPI_TYPE_PACKAGE:
-		if (obj->package.count != 2)
-			break;
+	if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 2) {
 		len = obj->package.elements[0].integer.value;
 		len = obj->package.elements[0].integer.value;
 		if (buf) {
 		if (buf) {
 			if (attribute == ACPI_ATTR_INDEX_SHOW)
 			if (attribute == ACPI_ATTR_INDEX_SHOW)
@@ -250,10 +246,10 @@ dsm_get_label(acpi_handle handle, int func,
 		}
 		}
 		kfree(output->pointer);
 		kfree(output->pointer);
 		return len;
 		return len;
-	break;
-	default:
-		kfree(output->pointer);
 	}
 	}
+
+	kfree(output->pointer);
+
 	return -1;
 	return -1;
 }
 }