[PATCH] ACPICA: Namespace: Fix wrong cleanup code in acpi_ns_execute_table()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



An error was captured by the static checker. This patch fixes the issue.
introduced in:
  Subject: ACPICA: ACPI 2.0, Interpreter: Fix MLC issues by switching to
           new TermList grammar for table loading

Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx>
---
 drivers/acpi/acpica/nsparse.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 2452bf3..72893a9 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -135,10 +135,12 @@ acpi_ns_execute_table(u32 table_index, struct acpi_namespace_node *start_node)
 	(void)acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
 
 cleanup:
-	acpi_ut_remove_reference(method_obj);
-	ACPI_FREE(info->full_pathname);
-	info->full_pathname = NULL;
+	if (info) {
+		ACPI_FREE(info->full_pathname);
+		info->full_pathname = NULL;
+	}
 	ACPI_FREE(info);
+	acpi_ut_remove_reference(method_obj);
 	return_ACPI_STATUS(status);
 }
 
-- 
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux