diff options
author | smitsohu <smitsohu@gmail.com> | 2020-08-17 22:10:07 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2020-08-17 22:10:07 +0200 |
commit | 21918f6d92f9261cc45f208ac407819980d4a59c (patch) | |
tree | d86d5dd041a8e79523f526411cb37b8d131c2ee1 | |
parent | add dumpable warnings (diff) | |
download | firejail-21918f6d92f9261cc45f208ac407819980d4a59c.tar.gz firejail-21918f6d92f9261cc45f208ac407819980d4a59c.tar.zst firejail-21918f6d92f9261cc45f208ac407819980d4a59c.zip |
cleanup
-rw-r--r-- | src/fcopy/main.c | 2 | ||||
-rw-r--r-- | src/fldd/main.c | 2 | ||||
-rw-r--r-- | src/fnet/main.c | 2 | ||||
-rw-r--r-- | src/fnetfilter/main.c | 2 | ||||
-rw-r--r-- | src/fsec-optimize/main.c | 1 | ||||
-rw-r--r-- | src/fsec-print/main.c | 2 | ||||
-rw-r--r-- | src/fseccomp/main.c | 1 |
7 files changed, 7 insertions, 5 deletions
diff --git a/src/fcopy/main.c b/src/fcopy/main.c index bda7e2f1b..67237b4ea 100644 --- a/src/fcopy/main.c +++ b/src/fcopy/main.c | |||
@@ -413,7 +413,7 @@ int main(int argc, char **argv) { | |||
413 | } | 413 | } |
414 | 414 | ||
415 | #ifdef WARN_DUMPABLE | 415 | #ifdef WARN_DUMPABLE |
416 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 416 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) |
417 | fprintf(stderr, "Error fcopy: I am dumpable\n"); | 417 | fprintf(stderr, "Error fcopy: I am dumpable\n"); |
418 | #endif | 418 | #endif |
419 | 419 | ||
diff --git a/src/fldd/main.c b/src/fldd/main.c index 567f6c566..d68504f6b 100644 --- a/src/fldd/main.c +++ b/src/fldd/main.c | |||
@@ -304,7 +304,7 @@ printf("\n"); | |||
304 | } | 304 | } |
305 | 305 | ||
306 | #ifdef WARN_DUMPABLE | 306 | #ifdef WARN_DUMPABLE |
307 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 307 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) |
308 | fprintf(stderr, "Error fldd: I am dumpable\n"); | 308 | fprintf(stderr, "Error fldd: I am dumpable\n"); |
309 | #endif | 309 | #endif |
310 | 310 | ||
diff --git a/src/fnet/main.c b/src/fnet/main.c index 22879b8ce..f6316a7fe 100644 --- a/src/fnet/main.c +++ b/src/fnet/main.c | |||
@@ -70,7 +70,7 @@ printf("\n"); | |||
70 | return 0; | 70 | return 0; |
71 | } | 71 | } |
72 | #ifdef WARN_DUMPABLE | 72 | #ifdef WARN_DUMPABLE |
73 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 73 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) |
74 | fprintf(stderr, "Error fnet: I am dumpable\n"); | 74 | fprintf(stderr, "Error fnet: I am dumpable\n"); |
75 | #endif | 75 | #endif |
76 | char *quiet = getenv("FIREJAIL_QUIET"); | 76 | char *quiet = getenv("FIREJAIL_QUIET"); |
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c index bac60cbec..1ca35ab56 100644 --- a/src/fnetfilter/main.c +++ b/src/fnetfilter/main.c | |||
@@ -182,7 +182,7 @@ printf("\n"); | |||
182 | return 1; | 182 | return 1; |
183 | } | 183 | } |
184 | #ifdef WARN_DUMPABLE | 184 | #ifdef WARN_DUMPABLE |
185 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 185 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) |
186 | fprintf(stderr, "Error fnetfilter: I am dumpable\n"); | 186 | fprintf(stderr, "Error fnetfilter: I am dumpable\n"); |
187 | #endif | 187 | #endif |
188 | char *destfile = (argc == 3)? argv[2]: argv[1]; | 188 | char *destfile = (argc == 3)? argv[2]: argv[1]; |
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c index 4da110583..fb13eeca8 100644 --- a/src/fsec-optimize/main.c +++ b/src/fsec-optimize/main.c | |||
@@ -45,6 +45,7 @@ printf("\n"); | |||
45 | } | 45 | } |
46 | 46 | ||
47 | #ifdef WARN_DUMPABLE | 47 | #ifdef WARN_DUMPABLE |
48 | // check FIREJAIL_PLUGIN in order to not print a warning during make | ||
48 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 49 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) |
49 | fprintf(stderr, "Error fsec-optimize: I am dumpable\n"); | 50 | fprintf(stderr, "Error fsec-optimize: I am dumpable\n"); |
50 | #endif | 51 | #endif |
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c index 858289767..d1f056e47 100644 --- a/src/fsec-print/main.c +++ b/src/fsec-print/main.c | |||
@@ -62,7 +62,7 @@ printf("\n"); | |||
62 | } | 62 | } |
63 | 63 | ||
64 | #ifdef WARN_DUMPABLE | 64 | #ifdef WARN_DUMPABLE |
65 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 65 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid()) |
66 | fprintf(stderr, "Error fsec-print: I am dumpable\n"); | 66 | fprintf(stderr, "Error fsec-print: I am dumpable\n"); |
67 | #endif | 67 | #endif |
68 | 68 | ||
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c index 6b7800f35..13eb3dfe7 100644 --- a/src/fseccomp/main.c +++ b/src/fseccomp/main.c | |||
@@ -70,6 +70,7 @@ printf("\n"); | |||
70 | } | 70 | } |
71 | 71 | ||
72 | #ifdef WARN_DUMPABLE | 72 | #ifdef WARN_DUMPABLE |
73 | // check FIREJAIL_PLUGIN in order to not print a warning during make | ||
73 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) | 74 | if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 1 && getuid() && getenv("FIREJAIL_PLUGIN")) |
74 | fprintf(stderr, "Error fseccomp: I am dumpable\n"); | 75 | fprintf(stderr, "Error fseccomp: I am dumpable\n"); |
75 | #endif | 76 | #endif |