proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-04-28 18:42:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setproctitle(): Handle potential NULL return from strrchr()

Browse Source 
Signed-off-by: Solar Designer <solar@openwall.com>
This commit is contained in:
Solar Designer 2023-04-11 15:29:46 +02:00
parent e2d10d666c
commit ebea2b5a99
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lxc/initutils.c
View File

@ -245,35 +245,31 @@ int setproctitle(char *title)
/*
* executable names may contain spaces, so we search backwards for the
* ), which is the kernel's marker for "end of executable name". this
* skips the first two fields.
* puts the pointer at the end of the second field.
*/
buf_ptr = strrchr(buf, ')')+2;
/* Skip the next 23 fields, column 26-28 are start_code, end_code,
* and start_stack */
buf_ptr = strchr(buf_ptr, ' ');
for (i = 0; i < 22; i++) {
if (!buf_ptr)
return -1;
buf_ptr = strchr(buf_ptr + 1, ' ');
}
buf_ptr = strrchr(buf, ')');
if (!buf_ptr)
return -1;
/* Skip the space and the next 23 fields, column 26-28 are start_code,
* end_code, and start_stack */
for (i = 0; i < 24; i++) {
buf_ptr = strchr(buf_ptr + 1, ' ');
if (!buf_ptr)
return -1;
}
i = sscanf(buf_ptr, "%" PRIu64 " %" PRIu64 " %" PRIu64, &start_code, &end_code, &start_stack);
if (i != 3)
return -1;
/* Skip the next 19 fields, column 45-51 are start_data to arg_end */
for (i = 0; i < 19; i++) {
buf_ptr = strchr(buf_ptr + 1, ' ');
if (!buf_ptr)
return -1;
buf_ptr = strchr(buf_ptr + 1, ' ');
}
if (!buf_ptr)
return -1;
i = sscanf(buf_ptr, "%" PRIu64 " %" PRIu64 " %" PRIu64 " %*u %*u %" PRIu64 " %" PRIu64, &start_data,
&end_data, &start_brk, &env_start, &env_end);
if (i != 5)