tools/iio/iio_utils:fix memory leak
[ Upstream commit f2edf0c819a4823cd6c288801ce737e8d4fcde06 ] 1. fopen sysfs without fclose. 2. asprintf filename without free. 3. if asprintf return error,do not need to free the buffer. Signed-off-by: Yulong Zhang <yulong.zhang@metoak.net> Link: https://lore.kernel.org/r/20230117025147.69890-1-yulong.zhang@metoak.net Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ea9b587896
commit
b854c66dd7
@ -262,6 +262,7 @@ int iioutils_get_param_float(float *output, const char *param_name,
|
|||||||
if (fscanf(sysfsfp, "%f", output) != 1)
|
if (fscanf(sysfsfp, "%f", output) != 1)
|
||||||
ret = errno ? -errno : -ENODATA;
|
ret = errno ? -errno : -ENODATA;
|
||||||
|
|
||||||
|
fclose(sysfsfp);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
error_free_filename:
|
error_free_filename:
|
||||||
@ -342,9 +343,9 @@ int build_channel_array(const char *device_dir,
|
|||||||
}
|
}
|
||||||
|
|
||||||
sysfsfp = fopen(filename, "r");
|
sysfsfp = fopen(filename, "r");
|
||||||
|
free(filename);
|
||||||
if (!sysfsfp) {
|
if (!sysfsfp) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
free(filename);
|
|
||||||
goto error_close_dir;
|
goto error_close_dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -354,7 +355,6 @@ int build_channel_array(const char *device_dir,
|
|||||||
if (fclose(sysfsfp))
|
if (fclose(sysfsfp))
|
||||||
perror("build_channel_array(): Failed to close file");
|
perror("build_channel_array(): Failed to close file");
|
||||||
|
|
||||||
free(filename);
|
|
||||||
goto error_close_dir;
|
goto error_close_dir;
|
||||||
}
|
}
|
||||||
if (ret == 1)
|
if (ret == 1)
|
||||||
@ -362,11 +362,9 @@ int build_channel_array(const char *device_dir,
|
|||||||
|
|
||||||
if (fclose(sysfsfp)) {
|
if (fclose(sysfsfp)) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
free(filename);
|
|
||||||
goto error_close_dir;
|
goto error_close_dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(filename);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
*ci_array = malloc(sizeof(**ci_array) * (*counter));
|
*ci_array = malloc(sizeof(**ci_array) * (*counter));
|
||||||
@ -392,9 +390,9 @@ int build_channel_array(const char *device_dir,
|
|||||||
}
|
}
|
||||||
|
|
||||||
sysfsfp = fopen(filename, "r");
|
sysfsfp = fopen(filename, "r");
|
||||||
|
free(filename);
|
||||||
if (!sysfsfp) {
|
if (!sysfsfp) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
free(filename);
|
|
||||||
count--;
|
count--;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
@ -402,20 +400,17 @@ int build_channel_array(const char *device_dir,
|
|||||||
errno = 0;
|
errno = 0;
|
||||||
if (fscanf(sysfsfp, "%i", ¤t_enabled) != 1) {
|
if (fscanf(sysfsfp, "%i", ¤t_enabled) != 1) {
|
||||||
ret = errno ? -errno : -ENODATA;
|
ret = errno ? -errno : -ENODATA;
|
||||||
free(filename);
|
|
||||||
count--;
|
count--;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fclose(sysfsfp)) {
|
if (fclose(sysfsfp)) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
free(filename);
|
|
||||||
count--;
|
count--;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!current_enabled) {
|
if (!current_enabled) {
|
||||||
free(filename);
|
|
||||||
count--;
|
count--;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -426,7 +421,6 @@ int build_channel_array(const char *device_dir,
|
|||||||
strlen(ent->d_name) -
|
strlen(ent->d_name) -
|
||||||
strlen("_en"));
|
strlen("_en"));
|
||||||
if (!current->name) {
|
if (!current->name) {
|
||||||
free(filename);
|
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
count--;
|
count--;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
@ -436,7 +430,6 @@ int build_channel_array(const char *device_dir,
|
|||||||
ret = iioutils_break_up_name(current->name,
|
ret = iioutils_break_up_name(current->name,
|
||||||
¤t->generic_name);
|
¤t->generic_name);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
free(filename);
|
|
||||||
free(current->name);
|
free(current->name);
|
||||||
count--;
|
count--;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
@ -447,17 +440,16 @@ int build_channel_array(const char *device_dir,
|
|||||||
scan_el_dir,
|
scan_el_dir,
|
||||||
current->name);
|
current->name);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
free(filename);
|
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
sysfsfp = fopen(filename, "r");
|
sysfsfp = fopen(filename, "r");
|
||||||
|
free(filename);
|
||||||
if (!sysfsfp) {
|
if (!sysfsfp) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
fprintf(stderr, "failed to open %s\n",
|
fprintf(stderr, "failed to open %s/%s_index\n",
|
||||||
filename);
|
scan_el_dir, current->name);
|
||||||
free(filename);
|
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -467,17 +459,14 @@ int build_channel_array(const char *device_dir,
|
|||||||
if (fclose(sysfsfp))
|
if (fclose(sysfsfp))
|
||||||
perror("build_channel_array(): Failed to close file");
|
perror("build_channel_array(): Failed to close file");
|
||||||
|
|
||||||
free(filename);
|
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fclose(sysfsfp)) {
|
if (fclose(sysfsfp)) {
|
||||||
ret = -errno;
|
ret = -errno;
|
||||||
free(filename);
|
|
||||||
goto error_cleanup_array;
|
goto error_cleanup_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(filename);
|
|
||||||
/* Find the scale */
|
/* Find the scale */
|
||||||
ret = iioutils_get_param_float(¤t->scale,
|
ret = iioutils_get_param_float(¤t->scale,
|
||||||
"scale",
|
"scale",
|
||||||
|
Loading…
Reference in New Issue
Block a user