diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-08-17 10:27:58 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@yahoo.com> | 2016-08-17 10:27:58 -0400 |
| commit | 46a15d38d347fe012b25a913c381a128a392edb0 (patch) | |
| tree | c762a75fc45c169a4459a3d3666a8d9447999f92 /src/lib/pid.c | |
| parent | slack profile integration (diff) | |
| download | firejail-46a15d38d347fe012b25a913c381a128a392edb0.tar.gz firejail-46a15d38d347fe012b25a913c381a128a392edb0.tar.zst firejail-46a15d38d347fe012b25a913c381a128a392edb0.zip | |
firemon fixes for x11 sandboxes
Diffstat (limited to 'src/lib/pid.c')
| -rw-r--r-- | src/lib/pid.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lib/pid.c b/src/lib/pid.c index d1ade389e..4540247a0 100644 --- a/src/lib/pid.c +++ b/src/lib/pid.c | |||
| @@ -340,18 +340,14 @@ void pid_read(pid_t mon_pid) { | |||
| 340 | exit(1); | 340 | exit(1); |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | if (mon_pid == 0 && strncmp(ptr, "firejail", 8) == 0) { | 343 | if ((strncmp(ptr, "firejail", 8) == 0) && (mon_pid == 0 || mon_pid == pid)) { |
| 344 | pids[pid].level = 1; | 344 | if (pid_proc_cmdline_x11(pid)) { |
| 345 | printf("--x11 detected for pid %d\n", pid); | ||
| 346 | pids[pid].level = -1; | ||
| 347 | } | ||
| 348 | else | ||
| 349 | pids[pid].level = 1; | ||
| 345 | } | 350 | } |
| 346 | else if (mon_pid == pid && strncmp(ptr, "firejail", 8) == 0) { | ||
| 347 | pids[pid].level = 1; | ||
| 348 | } | ||
| 349 | // else if (mon_pid == 0 && strncmp(ptr, "lxc-execute", 11) == 0) { | ||
| 350 | // pids[pid].level = 1; | ||
| 351 | // } | ||
| 352 | // else if (mon_pid == pid && strncmp(ptr, "lxc-execute", 11) == 0) { | ||
| 353 | // pids[pid].level = 1; | ||
| 354 | // } | ||
| 355 | else | 351 | else |
| 356 | pids[pid].level = -1; | 352 | pids[pid].level = -1; |
| 357 | } | 353 | } |