Module Name: src
Committed By: jruoho
Date: Thu Mar 4 20:46:18 UTC 2010
Modified Files:
src/sys/dev/acpi: smbus_acpi.c
Log Message:
Fix two memory leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/smbus_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.7 src/sys/dev/acpi/smbus_acpi.c:1.8
--- src/sys/dev/acpi/smbus_acpi.c:1.7 Thu Mar 4 20:17:30 2010
+++ src/sys/dev/acpi/smbus_acpi.c Thu Mar 4 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.8 2010/03/04 20:46:18 jruoho Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.8 2010/03/04 20:46:18 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -242,13 +242,20 @@
* Retrieve and display native controller info
*/
rv = AcpiGetParent(sc->sc_devnode->ad_handle, &native_dev);
+
+ native_bus_info = native_dev_info = NULL;
+
if (ACPI_SUCCESS(rv))
rv = AcpiGetParent(native_dev, &native_bus);
+
if (ACPI_SUCCESS(rv))
rv = AcpiGetObjectInfo(native_bus, &native_bus_info);
+
if (ACPI_SUCCESS(rv) &&
acpi_match_hid(native_bus_info, pcibus_acpi_ids) != 0) {
+
rv = AcpiGetObjectInfo(native_dev, &native_dev_info);
+
if (ACPI_SUCCESS(rv)) {
pci_bus = native_bus_info->Address;
pci_dev = ACPI_ADR_PCI_DEV(native_dev_info->Address);
@@ -263,6 +270,12 @@
}
}
+ if (native_bus_info != NULL)
+ ACPI_FREE(native_bus_info);
+
+ if (native_dev_info != NULL)
+ ACPI_FREE(native_dev_info);
+
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c_tag;
config_found_ia(self, "i2cbus", &iba, iicbus_print);
