coverity scan

7 files changed, 37 insertions, 22 deletions

diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index 4010de4b3..d949c1965 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -260,15 +260,19 @@ void shm_write_bandwidth_file(pid_t pid) {
         if (fp) {
                 IFBW *ptr = ifbw;
                 while (ptr) {
-                        fprintf(fp, "%s\n", ptr->txt);
+                        if (fprintf(fp, "%s\n", ptr->txt) < 0)
+                                goto errout;
                         ptr = ptr->next;
                 }
                 fclose(fp);
         }
-        else {
-                fprintf(stderr, "Error: cannot write bandwidht file %s\n", fname);
-                exit(1);
-        }
+        else
+                goto errout;
+        return;
+
+errout:
+        fprintf(stderr, "Error: cannot write bandwidht file %s\n", fname);
+        exit(1);
 }
 
 //***********************************
diff --git a/src/firejail/cgroup.c b/src/firejail/cgroup.c
index 2649d5505..4d64d3fd8 100644
--- a/src/firejail/cgroup.c
+++ b/src/firejail/cgroup.c
@@ -34,17 +34,22 @@ void save_cgroup(void) {
         if (fp) {
                 fprintf(fp, "%s", cfg.cgroup);
                 fflush(0);
-                fclose(fp);
+                if (fclose(fp))
+                        goto errout;
                 if (chown(fname, 0, 0) < 0)
                         errExit("chown");
         }
-        else {
-                fprintf(stderr, "Error: cannot save cgroup\n");
-                free(fname);
-                exit(1);
-        }
+        else
+                goto errout;
         
         free(fname);
+        return;
+
+errout:
+        fprintf(stderr, "Error: cannot save cgroup\n");
+        free(fname);
+        exit(1);
+
 }
 
 void load_cgroup(const char *fname) {
diff --git a/src/firejail/env.c b/src/firejail/env.c
index b4557e56f..b4f56a9f0 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -72,7 +72,8 @@ void env_apply(void) {
         Env *env = envlist;
         
         while (env) {
-                setenv(env->name, env->value, 1);
+                if (setenv(env->name, env->value, 1) < 0)
+                        errExit("setenv");
                 env = env->next;
         }
 }
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index e7388a539..755cb9f6e 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -345,18 +345,20 @@ void fs_blacklist(void) {
 
                 // expand path macro - look for the file in /bin, /usr/bin, /sbin and  /usr/sbin directories
                 // TODO: should we look for more bin paths?
-                if (strncmp(ptr, "${PATH}", 7) == 0) {
-                        char *fname = ptr + 7;
-                        size_t fname_len = strlen(fname);
-                        char **path, *paths[] = {"/bin", "/sbin", "/usr/bin", "/usr/sbin", NULL};
-                        for (path = &paths[0]; *path; path++) {
-                                char newname[strlen(*path) + fname_len + 1];
-                                sprintf(newname, "%s%s", *path, fname);
-                                globbing(op, newname, (const char**)noblacklist, noblacklist_c, emptydir, emptyfile);
+                if (ptr) {
+                        if (strncmp(ptr, "${PATH}", 7) == 0) {
+                                char *fname = ptr + 7;
+                                size_t fname_len = strlen(fname);
+                                char **path, *paths[] = {"/bin", "/sbin", "/usr/bin", "/usr/sbin", NULL};
+                                for (path = &paths[0]; *path; path++) {
+                                        char newname[strlen(*path) + fname_len + 1];
+                                        sprintf(newname, "%s%s", *path, fname);
+                                        globbing(op, newname, (const char**)noblacklist, noblacklist_c, emptydir, emptyfile);
+                                }
                         }
+                        else
+                                globbing(op, ptr, (const char**)noblacklist, noblacklist_c, emptydir, emptyfile);
                 }
-                else
-                        globbing(op, ptr, (const char**)noblacklist, noblacklist_c, emptydir, emptyfile);
 
                 if (new_name)
                         free(new_name);
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 714417867..2df48ffbb 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -377,6 +377,7 @@ static void duplicate(char *name) {
         if (system(cmd))
                 errExit("system cp -a --parents");
         free(cmd);
+        free(fname);
 }
 
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 60c2a7cec..82d17264a 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -612,6 +612,7 @@ int main(int argc, char **argv) {
                                 errExit("asprintf");
                         struct stat s;
                         if (stat(dirname, &s) == -1) {
+                                /* coverity[toctou] */
                                 if (mkdir(dirname, S_IRWXU | S_IRWXG | S_IRWXO))
                                         errExit("mkdir");
                                 if (chown(dirname, getuid(), getgid()) < 0)
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index 04666a69f..6322b81fa 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -52,6 +52,7 @@ int check_kernel_procs(void) {
                 }
                 
                 // open file
+                /* coverity[toctou] */
                 FILE *fp = fopen(fname, "r");
                 if (!fp) {
                         fprintf(stderr, "Warning: cannot open %s\n", fname);