Commit 7ccd4506 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman

IIO: Documentation: iio_utils: Prevent buffer overflow

The first part of build_channel_array()identifies the number of enabled channels.
Further down this count is used to allocate the ci_array. The next section parses the
scan_elements directory again, and fills ci_array regardless if the channel is enabled or not.
So if less than available channels are enabled ci_array memory is overflowed.

This fix makes sure that we allocate enough memory. But the whole approach looks a bit
cumbersome to me. Why not allocate memory for MAX_CHANNLES, less say 64
(I never seen a part with more than that channels). And skip the first part entirely.
Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2bf99c70
...@@ -290,15 +290,17 @@ inline int build_channel_array(const char *device_dir, ...@@ -290,15 +290,17 @@ inline int build_channel_array(const char *device_dir,
fscanf(sysfsfp, "%u", &ret); fscanf(sysfsfp, "%u", &ret);
if (ret == 1) if (ret == 1)
(*counter)++; (*counter)++;
count++;
fclose(sysfsfp); fclose(sysfsfp);
free(filename); free(filename);
} }
*ci_array = malloc(sizeof(**ci_array)*(*counter)); *ci_array = malloc(sizeof(**ci_array)*count);
if (*ci_array == NULL) { if (*ci_array == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_close_dir; goto error_close_dir;
} }
seekdir(dp, 0); seekdir(dp, 0);
count = 0;
while (ent = readdir(dp), ent != NULL) { while (ent = readdir(dp), ent != NULL) {
if (strcmp(ent->d_name + strlen(ent->d_name) - strlen("_en"), if (strcmp(ent->d_name + strlen(ent->d_name) - strlen("_en"),
"_en") == 0) { "_en") == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment