aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2015-11-29 13:02:48 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2015-11-29 13:02:48 -0500
commit4e22add64497a1edef18854efc52ca0b682c0bcb (patch)
treef67a5cddbddde2519e2482a5cc7027cd649348b0 /src
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-4e22add64497a1edef18854efc52ca0b682c0bcb.tar.gz
firejail-4e22add64497a1edef18854efc52ca0b682c0bcb.tar.zst
firejail-4e22add64497a1edef18854efc52ca0b682c0bcb.zip
llvm scan
Diffstat (limited to 'src')
-rw-r--r--src/firejail/fs_logger.c1
-rw-r--r--src/firejail/fs_whitelist.c4
-rw-r--r--src/firejail/network.c4
-rw-r--r--src/libtrace/libtrace.c4
4 files changed, 8 insertions, 5 deletions
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;