diff options
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | src/firejail/fs_logger.c | 1 | ||||
-rw-r--r-- | src/firejail/fs_whitelist.c | 4 | ||||
-rw-r--r-- | src/firejail/network.c | 4 | ||||
-rw-r--r-- | src/libtrace/libtrace.c | 4 | ||||
-rw-r--r-- | todo | 2 |
6 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 083a88538..c14ec5cdc 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -184,3 +184,9 @@ deb: dist | |||
184 | extras: all | 184 | extras: all |
185 | $(MAKE) -C extras/firetools | 185 | $(MAKE) -C extras/firetools |
186 | 186 | ||
187 | cppcheck: clean | ||
188 | cppcheck --force . | ||
189 | |||
190 | scan-build: clean | ||
191 | scan-build make | ||
192 | |||
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c index f735b1489..9f742c5bd 100644 --- a/src/firejail/fs_logger.c +++ b/src/firejail/fs_logger.c | |||
@@ -90,6 +90,7 @@ void fs_logger_print(void) { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | int rv = chown(RUN_FSLOGGER_FILE, getuid(), getgid()); | 92 | int rv = chown(RUN_FSLOGGER_FILE, getuid(), getgid()); |
93 | (void) rv; // best effort! | ||
93 | rv = chmod(RUN_FSLOGGER_FILE, 0600); | 94 | rv = chmod(RUN_FSLOGGER_FILE, 0600); |
94 | (void) rv; // best effort! | 95 | (void) rv; // best effort! |
95 | 96 | ||
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c index e0187981b..a584cb69d 100644 --- a/src/firejail/fs_whitelist.c +++ b/src/firejail/fs_whitelist.c | |||
@@ -390,8 +390,10 @@ void fs_whitelist(void) { | |||
390 | // mark symbolic links | 390 | // mark symbolic links |
391 | if (is_link(new_name)) | 391 | if (is_link(new_name)) |
392 | entry->link = new_name; | 392 | entry->link = new_name; |
393 | else | 393 | else { |
394 | free(new_name); | 394 | free(new_name); |
395 | new_name = NULL; | ||
396 | } | ||
395 | 397 | ||
396 | // change file name in entry->data | 398 | // change file name in entry->data |
397 | if (strcmp(fname, entry->data + 10) != 0) { | 399 | if (strcmp(fname, entry->data + 10) != 0) { |
diff --git a/src/firejail/network.c b/src/firejail/network.c index 461946d83..5f7a84a1e 100644 --- a/src/firejail/network.c +++ b/src/firejail/network.c | |||
@@ -138,8 +138,8 @@ void net_set_mtu(const char *ifname, int mtu) { | |||
138 | ifr.ifr_addr.sa_family = AF_INET; | 138 | ifr.ifr_addr.sa_family = AF_INET; |
139 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 139 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
140 | ifr.ifr_mtu = mtu; | 140 | ifr.ifr_mtu = mtu; |
141 | if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) == 0) | 141 | if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) |
142 | mtu = ifr.ifr_mtu; | 142 | fprintf(stderr, "Warning: cannot set mtu for interface %s\n", ifname); |
143 | close(s); | 143 | close(s); |
144 | } | 144 | } |
145 | 145 | ||
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c index b763213f6..44f0cc4d0 100644 --- a/src/libtrace/libtrace.c +++ b/src/libtrace/libtrace.c | |||
@@ -490,9 +490,9 @@ int socket(int domain, int type, int protocol) { | |||
490 | 490 | ||
491 | str = translate(socket_protocol, protocol); | 491 | str = translate(socket_protocol, protocol); |
492 | if (str == NULL) | 492 | if (str == NULL) |
493 | ptr += sprintf(ptr, "%d", protocol); | 493 | sprintf(ptr, "%d", protocol); |
494 | else | 494 | else |
495 | ptr += sprintf(ptr, "%s", str); | 495 | sprintf(ptr, "%s", str); |
496 | 496 | ||
497 | printf("%s\n", buf); | 497 | printf("%s\n", buf); |
498 | return rv; | 498 | return rv; |
@@ -154,4 +154,4 @@ I was messing around with my fstab, and found out that firejail can't have /usr/ | |||
154 | /dev/mapper/asdf-usr--local /usr/local ext4 defaults,nosuid,noatime,ro 0 2 | 154 | /dev/mapper/asdf-usr--local /usr/local ext4 defaults,nosuid,noatime,ro 0 2 |
155 | /dev/mapper/asdf-usr--sbin /usr/sbin ext4 defaults,nosuid,,noatime,ro 0 2 | 155 | /dev/mapper/asdf-usr--sbin /usr/sbin ext4 defaults,nosuid,,noatime,ro 0 2 |
156 | /dev/mapper/asdf-var /var ext4 discard,noatime,nodev,nosuid 0 2 | 156 | /dev/mapper/asdf-var /var ext4 discard,noatime,nodev,nosuid 0 2 |
157 | tmpfs /tmp tmpfs noatime,nosuid,nodev,size=2G 0 1 \ No newline at end of file | 157 | tmpfs /tmp tmpfs noatime,nosuid,nodev,size=2G 0 1 |