diff options
author | netblue30 <netblue30@yahoo.com> | 2017-10-11 08:41:51 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-10-11 08:41:51 -0400 |
commit | e7b6317b3f31e1bc89ac2cbee08dc49a6af497fe (patch) | |
tree | b4efecc8eae97fb14a72200e2aa48990005b5934 /src | |
parent | private-lib cleanup (diff) | |
download | firejail-e7b6317b3f31e1bc89ac2cbee08dc49a6af497fe.tar.gz firejail-e7b6317b3f31e1bc89ac2cbee08dc49a6af497fe.tar.zst firejail-e7b6317b3f31e1bc89ac2cbee08dc49a6af497fe.zip |
--build fixes and compile cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/fbuilder/build_fs.c | 2 | ||||
-rw-r--r-- | src/fbuilder/build_profile.c | 4 | ||||
-rw-r--r-- | src/firejail/fs_lib.c | 1 | ||||
-rw-r--r-- | src/firejail/main.c | 1 | ||||
-rw-r--r-- | src/fldd/main.c | 1 | ||||
-rw-r--r-- | src/libtrace/libtrace.c | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c index dcd86e069..6f3907770 100644 --- a/src/fbuilder/build_fs.c +++ b/src/fbuilder/build_fs.c | |||
@@ -260,7 +260,7 @@ static void dev_callback(char *ptr) { | |||
260 | void build_dev(const char *fname) { | 260 | void build_dev(const char *fname) { |
261 | assert(fname); | 261 | assert(fname); |
262 | 262 | ||
263 | process_files(fname, "/tmp", tmp_callback); | 263 | process_files(fname, "/dev", dev_callback); |
264 | 264 | ||
265 | if (dev_out == NULL) | 265 | if (dev_out == NULL) |
266 | printf("private-dev\n"); | 266 | printf("private-dev\n"); |
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index 0f71fe7ad..fbe48cd4b 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c | |||
@@ -72,14 +72,14 @@ void build_profile(int argc, char **argv, int index) { | |||
72 | have_strace = 1; | 72 | have_strace = 1; |
73 | 73 | ||
74 | // calculate command length | 74 | // calculate command length |
75 | int len = (int) sizeof(cmdlist) / sizeof(char*) + argc - index + 1; | 75 | unsigned len = (int) sizeof(cmdlist) / sizeof(char*) + argc - index + 1; |
76 | if (arg_debug) | 76 | if (arg_debug) |
77 | printf("command len %d + %d + 1\n", (int) (sizeof(cmdlist) / sizeof(char*)), argc - index); | 77 | printf("command len %d + %d + 1\n", (int) (sizeof(cmdlist) / sizeof(char*)), argc - index); |
78 | char *cmd[len]; | 78 | char *cmd[len]; |
79 | cmd[0] = cmdlist[0]; // explicit assignemnt to clean scan-build error | 79 | cmd[0] = cmdlist[0]; // explicit assignemnt to clean scan-build error |
80 | 80 | ||
81 | // build command | 81 | // build command |
82 | int i = 0; | 82 | unsigned i = 0; |
83 | for (i = 0; i < (int) sizeof(cmdlist) / sizeof(char*); i++) { | 83 | for (i = 0; i < (int) sizeof(cmdlist) / sizeof(char*); i++) { |
84 | // skip strace if not installed | 84 | // skip strace if not installed |
85 | if (have_strace == 0 && strcmp(cmdlist[i], "/usr/bin/strace") == 0) | 85 | if (have_strace == 0 && strcmp(cmdlist[i], "/usr/bin/strace") == 0) |
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index 6826f906c..2cb32fe69 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -320,7 +320,6 @@ void fs_private_lib(void) { | |||
320 | char *name; | 320 | char *name; |
321 | if (asprintf(&name, "/usr/lib/%s", ptr) == -1) | 321 | if (asprintf(&name, "/usr/lib/%s", ptr) == -1) |
322 | errExit("asprintf"); | 322 | errExit("asprintf"); |
323 | struct stat s; | ||
324 | if (is_dir(name)) { | 323 | if (is_dir(name)) { |
325 | fslib_copy_dir(name); | 324 | fslib_copy_dir(name); |
326 | fslib_copy_libs(name); | 325 | fslib_copy_libs(name); |
diff --git a/src/firejail/main.c b/src/firejail/main.c index e83bc899f..c9edcec29 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -851,6 +851,7 @@ static int check_arg(int argc, char **argv, const char *argument) { | |||
851 | 851 | ||
852 | static void run_builder(int argc, char **argv) { | 852 | static void run_builder(int argc, char **argv) { |
853 | EUID_ASSERT(); | 853 | EUID_ASSERT(); |
854 | (void) argc; | ||
854 | 855 | ||
855 | // drop privileges | 856 | // drop privileges |
856 | if (setgid(getgid()) < 0) | 857 | if (setgid(getgid()) < 0) |
diff --git a/src/fldd/main.c b/src/fldd/main.c index 0d8292a76..8e5b2bcb5 100644 --- a/src/fldd/main.c +++ b/src/fldd/main.c | |||
@@ -101,6 +101,7 @@ static void storage_print(Storage *ptr, int fd) { | |||
101 | 101 | ||
102 | static bool ptr_ok(const void *ptr, const void *base, const void *end, const char *name) { | 102 | static bool ptr_ok(const void *ptr, const void *base, const void *end, const char *name) { |
103 | bool r; | 103 | bool r; |
104 | (void) name; | ||
104 | 105 | ||
105 | r = (ptr >= base && ptr < end); | 106 | r = (ptr >= base && ptr < end); |
106 | return r; | 107 | return r; |
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c index 04cf64997..7bdf6c948 100644 --- a/src/libtrace/libtrace.c +++ b/src/libtrace/libtrace.c | |||
@@ -678,6 +678,8 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid) { | |||
678 | // it can be used to build things like private-bin | 678 | // it can be used to build things like private-bin |
679 | __attribute__((constructor)) | 679 | __attribute__((constructor)) |
680 | static void log_exec(int argc, char** argv) { | 680 | static void log_exec(int argc, char** argv) { |
681 | (void) argc; | ||
682 | (void) argv; | ||
681 | static char buf[PATH_MAX + 1]; | 683 | static char buf[PATH_MAX + 1]; |
682 | int rv = readlink("/proc/self/exe", buf, PATH_MAX); | 684 | int rv = readlink("/proc/self/exe", buf, PATH_MAX); |
683 | if (rv != -1) { | 685 | if (rv != -1) { |