picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

process-util: don't use overly large buffer to store process command line

Browse source 
Allocate new string as a return value and free our "scratch pad"
buffer that is potentially much larger than needed (up to
_SC_ARG_MAX).

Fixes #11502
This commit is contained in:
Michal Sekletar 2019-01-22 14:29:50 +01:00 committed by Lennart Poettering
parent c11cd775db
commit eb1ec489ee
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/basic/process-util.c
View file

@ -102,7 +102,8 @@ int get_process_comm(pid_t pid, char **ret) {
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) {
_cleanup_fclose_ FILE *f = NULL;
bool space = false;
char *k, *ans = NULL;
char *k;
_cleanup_free_ char *ans = NULL;
const char *p;
int c;
@ -143,7 +144,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
if (!ans)
return -ENOMEM;
*line = ans;
*line = TAKE_PTR(ans);
return 0;
} else {
@ -208,7 +209,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
_cleanup_free_ char *t = NULL;
int h;
free(ans);
ans = mfree(ans);
if (!comm_fallback)
return -ENOENT;
@ -241,9 +242,18 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
if (!ans)
return -ENOMEM;
}
*line = TAKE_PTR(ans);
return 0;
}
*line = ans;
k = realloc(ans, strlen(ans) + 1);
if (!k)
return -ENOMEM;
ans = NULL;
*line = k;
return 0;
}