Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b854c66d authored by Yulong Zhang's avatar Yulong Zhang Committed by Greg Kroah-Hartman
Browse files

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: default avatarYulong Zhang <yulong.zhang@metoak.net>
Link: https://lore.kernel.org/r/20230117025147.69890-1-yulong.zhang@metoak.net


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ea9b5878

tools/iio/iio_utils.c

+6 −17
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ int iioutils_get_param_float(float *output, const char *param_name, 
			if (fscanf(sysfsfp, "%f", output) != 1)

				ret = errno ? -errno : -ENODATA;



			fclose(sysfsfp);

			break;

		}

error_free_filename:
@@ -342,9 +343,9 @@ int build_channel_array(const char *device_dir, 
			}



			sysfsfp = fopen(filename, "r");

			free(filename);

			if (!sysfsfp) {

				ret = -errno;

				free(filename);

				goto error_close_dir;

			}
@@ -354,7 +355,6 @@ int build_channel_array(const char *device_dir, 
				if (fclose(sysfsfp))

					perror("build_channel_array(): Failed to close file");



				free(filename);

				goto error_close_dir;

			}

			if (ret == 1)
@@ -362,11 +362,9 @@ int build_channel_array(const char *device_dir, 


			if (fclose(sysfsfp)) {

				ret = -errno;

				free(filename);

				goto error_close_dir;

			}



			free(filename);

		}



	*ci_array = malloc(sizeof(**ci_array) * (*counter));
@@ -392,9 +390,9 @@ int build_channel_array(const char *device_dir, 
			}



			sysfsfp = fopen(filename, "r");

			free(filename);

			if (!sysfsfp) {

				ret = -errno;

				free(filename);

				count--;

				goto error_cleanup_array;

			}
@@ -402,20 +400,17 @@ int build_channel_array(const char *device_dir, 
			errno = 0;

			if (fscanf(sysfsfp, "%i", &current_enabled) != 1) {

				ret = errno ? -errno : -ENODATA;

				free(filename);

				count--;

				goto error_cleanup_array;

			}



			if (fclose(sysfsfp)) {

				ret = -errno;

				free(filename);

				count--;

				goto error_cleanup_array;

			}



			if (!current_enabled) {

				free(filename);

				count--;

				continue;

			}
@@ -426,7 +421,6 @@ int build_channel_array(const char *device_dir, 
						strlen(ent->d_name) -

						strlen("_en"));

			if (!current->name) {

				free(filename);

				ret = -ENOMEM;

				count--;

				goto error_cleanup_array;
@@ -436,7 +430,6 @@ int build_channel_array(const char *device_dir, 
			ret = iioutils_break_up_name(current->name,

						     &current->generic_name);

			if (ret) {

				free(filename);

				free(current->name);

				count--;

				goto error_cleanup_array;
@@ -447,17 +440,16 @@ int build_channel_array(const char *device_dir, 
				       scan_el_dir,

				       current->name);

			if (ret < 0) {

				free(filename);

				ret = -ENOMEM;

				goto error_cleanup_array;

			}



			sysfsfp = fopen(filename, "r");

			free(filename);

			if (!sysfsfp) {

				ret = -errno;

				fprintf(stderr, "failed to open %s\n",

					filename);

				free(filename);

				fprintf(stderr, "failed to open %s/%s_index\n",

					scan_el_dir, current->name);

				goto error_cleanup_array;

			}
@@ -467,17 +459,14 @@ int build_channel_array(const char *device_dir, 
				if (fclose(sysfsfp))

					perror("build_channel_array(): Failed to close file");



				free(filename);

				goto error_cleanup_array;

			}



			if (fclose(sysfsfp)) {

				ret = -errno;

				free(filename);

				goto error_cleanup_array;

			}



			free(filename);

			/* Find the scale */

			ret = iioutils_get_param_float(&current->scale,

						       "scale",