summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorErik Schmauss <erik.schmauss@intel.com>2017-11-17 15:42:23 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-27 01:20:32 +0100
commitdea4e83358f23bcb178e9cb23e9278ff5a8cea76 (patch)
tree9013f62eef1673ab8f5162b85cd894a7f54b224a /drivers/acpi
parent16ccf829201cef23edaa5524f3f91e05861c4455 (diff)
downloadlinux-stable-dea4e83358f23bcb178e9cb23e9278ff5a8cea76.tar.gz
linux-stable-dea4e83358f23bcb178e9cb23e9278ff5a8cea76.tar.bz2
linux-stable-dea4e83358f23bcb178e9cb23e9278ff5a8cea76.zip
ACPICA: Namespace: fix memory leak from building prefixed pathname
ACPICA commit f8ca5db30605467b851f86d152079631c27eeca8 Link: https://github.com/acpica/acpica/commit/f8ca5db3 Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/nsnames.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 4203d4589b6d..22c92d1a24d8 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -377,7 +377,7 @@ char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope,
{
acpi_status status;
char *full_path = NULL;
- char *external_path;
+ char *external_path = NULL;
char *prefix_path = NULL;
u32 prefix_path_length = 0;
@@ -423,6 +423,9 @@ cleanup:
if (prefix_path) {
ACPI_FREE(prefix_path);
}
+ if (external_path) {
+ ACPI_FREE(external_path);
+ }
return (full_path);
}