github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

bugfix: firemon: fix potential memory leak in procevent_monitor

Browse source 
Simplify the deallocation of `cmd` to make it easier to understand,
which looks like it would fix a potential memory leak of `cmd`:

    if (!cmd) {
        cmd = pid_proc_cmdline(pid); // alloc
    }
    if (add_new) {
        // ...                       // no dealloc
    }
    else if (proc_ev->what == PROC_EVENT_EXIT && pids[pid].level == 1) {
        // ...                       // no dealloc
    }
    else {
        // ...
        else {
            sprintf(lineptr, " %s\n", cmd);
            if (cmd != pids[pid].option.event.cmd) {
                free(cmd);           // dealloc
            }
        }
        // ...
    }

This is a follow-up to commit 5ec00f70c ("fix: avoid cmd double-free in
procevent_monitor", 2025-07-31) / PR #6846.

Relates to #6792.
This commit is contained in:
Kelvin M. Klann 2025-08-19 10:08:11 -03:00
parent 6228f71ad5
commit b45a80e660
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/firemon/procevent.c
View file

@ -471,8 +471,10 @@ static void __attribute__((noreturn)) procevent_monitor(const int sock, pid_t my
int sandbox_closed = 0; // exit sandbox flag
int cmd_dup = 0;
char *cmd = pids[pid].option.event.cmd;
if (!cmd) {
cmd_dup = 1;
cmd = pid_proc_cmdline(pid);
}
if (add_new) {
@ -490,20 +492,22 @@ static void __attribute__((noreturn)) procevent_monitor(const int sock, pid_t my
}
else {
if (!cmd) {
cmd_dup = 1;
cmd = pid_proc_cmdline(pid);
}
if (cmd == NULL || nodisplay)
if (!cmd || nodisplay)
sprintf(lineptr, "\n");
else {
else
sprintf(lineptr, " %s\n", cmd);
if (cmd != pids[pid].option.event.cmd) {
free(cmd);
}
}
lineptr += strlen(lineptr);
}
(void) lineptr;
if (cmd && cmd_dup) {
free(cmd);
cmd = NULL;
}
// print the event
printf("%s", line);
fflush(0);