[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20241108044700.37633-1-zhangjiao2@cmss.chinamobile.com>
Date: Fri, 8 Nov 2024 12:47:00 +0800
From: zhangjiao2 <zhangjiao2@...s.chinamobile.com>
To: rafael@...nel.org
Cc: daniel.lezcano@...aro.org,
rui.zhang@...el.com,
lukasz.luba@....com,
linux-pm@...r.kernel.org,
linux-kernel@...r.kernel.org,
zhang jiao <zhangjiao2@...s.chinamobile.com>
Subject: [PATCH] tools/thermal: Fix common realloc mistake
From: zhang jiao <zhangjiao2@...s.chinamobile.com>
Do not set thermometer->tz NULL when realloc failed.
Signed-off-by: zhang jiao <zhangjiao2@...s.chinamobile.com>
---
tools/thermal/thermometer/thermometer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/thermal/thermometer/thermometer.c b/tools/thermal/thermometer/thermometer.c
index 1a87a0a77f9f..e08291a97fd8 100644
--- a/tools/thermal/thermometer/thermometer.c
+++ b/tools/thermal/thermometer/thermometer.c
@@ -259,6 +259,7 @@ static int thermometer_add_tz(const char *path, const char *name, int polling,
{
int fd;
char tz_path[PATH_MAX];
+ void *tmp;
sprintf(tz_path, CLASS_THERMAL"/%s/temp", path);
@@ -268,12 +269,13 @@ static int thermometer_add_tz(const char *path, const char *name, int polling,
return -1;
}
- thermometer->tz = realloc(thermometer->tz,
+ tmp = realloc(thermometer->tz,
sizeof(*thermometer->tz) * (thermometer->nr_tz + 1));
- if (!thermometer->tz) {
+ if (!tmp) {
ERROR("Failed to allocate thermometer->tz\n");
return -1;
}
+ thermometer->tz = tmp;
thermometer->tz[thermometer->nr_tz].fd_temp = fd;
thermometer->tz[thermometer->nr_tz].name = strdup(name);
--
2.33.0
Powered by blists - more mailing lists