Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/iio/iio_utils:fix memory leak

Browse Source 
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>
This commit is contained in:
Yulong Zhang 2023-01-17 10:51:47 +08:00 committed by Jonathan Cameron
parent 05f59aba39
commit f2edf0c819
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/iio/iio_utils.c
View File

@ -264,6 +264,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:
@ -345,9 +346,9 @@ int build_channel_array(const char *device_dir, int buffer_idx,
} }
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;
} }
@ -357,7 +358,6 @@ int build_channel_array(const char *device_dir, int buffer_idx,
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)
@ -365,11 +365,9 @@ int build_channel_array(const char *device_dir, int buffer_idx,
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));
@ -395,9 +393,9 @@ int build_channel_array(const char *device_dir, int buffer_idx,
} }
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;
} }
@ -405,20 +403,17 @@ int build_channel_array(const char *device_dir, int buffer_idx,
errno = 0; errno = 0;
if (fscanf(sysfsfp, "%i", &current_enabled) != 1) { if (fscanf(sysfsfp, "%i", &current_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;
} }
@ -429,7 +424,6 @@ int build_channel_array(const char *device_dir, int buffer_idx,
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;
@ -439,7 +433,6 @@ int build_channel_array(const char *device_dir, int buffer_idx,
ret = iioutils_break_up_name(current->name, ret = iioutils_break_up_name(current->name,
&current->generic_name); &current->generic_name);
if (ret) { if (ret) {
free(filename);
free(current->name); free(current->name);
count--; count--;
goto error_cleanup_array; goto error_cleanup_array;
@ -450,17 +443,16 @@ int build_channel_array(const char *device_dir, int buffer_idx,
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;
} }
@ -470,17 +462,14 @@ int build_channel_array(const char *device_dir, int buffer_idx,
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(&current->scale, ret = iioutils_get_param_float(&current->scale,
"scale", "scale",