OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools: logger: Use a safe variant of the string manipulation functions 

Used string manipulation functions that check the size of the available
buffer.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
This commit is contained in:
Adrian Warecki 2023-09-18 15:42:56 +02:00 committed by Liam Girdwood
parent 56a1352163
commit 651af68384
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/logger/logger.c
View File

@ -104,8 +104,8 @@ static int snapshot(const char *name)
for (i = 0; i < ARRAY_SIZE(debugfs); i++) { for (i = 0; i < ARRAY_SIZE(debugfs); i++) {
sprintf(pinname, "%s/%s", path, debugfs[i]); snprintf(pinname, sizeof(pinname), "%s/%s", path, debugfs[i]);
sprintf(poutname, "%s.%s.txt", name, debugfs[i]); snprintf(poutname, sizeof(poutname), "%s.%s.txt", name, debugfs[i]);
/* open debugfs for reading */ /* open debugfs for reading */
in_fd = fopen(pinname, "rb"); in_fd = fopen(pinname, "rb");
@ -132,7 +132,7 @@ static int snapshot(const char *name)
if (count != 4) if (count != 4)
break; break;
sprintf(buffer, "0x%6.6x: 0x%8.8x\n", addr, val); snprintf(buffer, sizeof(buffer), "0x%6.6x: 0x%8.8x\n", addr, val);
count = fwrite(buffer, 1, strlen(buffer), out_fd); count = fwrite(buffer, 1, strlen(buffer), out_fd);
@ -220,17 +220,15 @@ static void *wait_open(const char *watched_dir, const char *expected_file)
const int dwatch = inotify_add_watch(iqueue, watched_dir, IN_CREATE); const int dwatch = inotify_add_watch(iqueue, watched_dir, IN_CREATE);
struct stat expected_stat; struct stat expected_stat;
void *ret_stream = NULL; void *ret_stream = NULL;
const int fpath_len = strlen(watched_dir) + 1 + strlen(expected_file) + 1;
char * const fpath = malloc(strlen(watched_dir) + 1 + strlen(expected_file) + 1); char * const fpath = malloc(fpath_len);
if (!fpath) { if (!fpath) {
fprintf(stderr, "error: can't allocate memory\n"); fprintf(stderr, "error: can't allocate memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
strcpy(fpath, watched_dir); snprintf(fpath, fpath_len, "%s/%s", watched_dir, expected_file);
strcat(fpath, "/");
strcat(fpath, expected_file);
/* Not racy because the inotify watch was set first. */ /* Not racy because the inotify watch was set first. */
if (!access(fpath, F_OK)) if (!access(fpath, F_OK))