[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230725220056.25560-3-jorge.lopez2@hp.com>
Date: Tue, 25 Jul 2023 17:00:53 -0500
From: Jorge Lopez <jorgealtxwork@...il.com>
To: hdegoede@...hat.com, platform-driver-x86@...r.kernel.org,
linux-kernel@...r.kernel.org, thomas@...ch.de,
ilpo.jarvinen@...ux.intel.com
Subject: [PATCH 2/5] hp-bioscfg: Fix memory leaks in ordered_list_elements_from_package
Address memory leaks in hp_populate_ordered_list_elements_from_package() and
uninitialized variable errors.
Signed-off-by: Jorge Lopez <jorge.lopez2@...com>
---
Based on the latest platform-drivers-x86.git/for-next
---
.../platform/x86/hp/hp-bioscfg/order-list-attributes.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
index 7e49a8427c06..89e67db733eb 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
@@ -131,10 +131,10 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord
int instance_id)
{
char *str_value = NULL;
- int value_len;
+ int value_len = 0;
int ret;
u32 size;
- u32 int_value;
+ u32 int_value = 0;
int elem;
int reqs;
int eloc;
@@ -174,6 +174,7 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord
if (expected_order_types[eloc] != order_obj[elem].type) {
pr_err("Error expected type %d for elem %d, but got type %d instead\n",
expected_order_types[eloc], elem, order_obj[elem].type);
+ kfree(str_value);
return -EIO;
}
@@ -231,6 +232,7 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord
sizeof(ordered_list_data->common.prerequisites[reqs]));
kfree(str_value);
+ str_value = NULL;
}
break;
@@ -277,13 +279,17 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord
part = strsep(&part_tmp, SEMICOLON_SEP);
}
+ kfree(str_value);
+ str_value = NULL;
break;
default:
pr_warn("Invalid element: %d found in Ordered_List attribute or data may be malformed\n", elem);
break;
}
kfree(tmpstr);
+ tmpstr = NULL;
kfree(str_value);
+ str_value = NULL;
}
exit_list:
--
2.34.1
Powered by blists - more mailing lists