9 files changed, 68 insertions, 20 deletions

diff --git a/RELNOTES b/RELNOTES
index 8281c71a9..4b6cd2dca 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,13 +1,11 @@
-firejail (0.9.37) baseline; urgency=low
-  * development version
-  * security profiles fixes
-  * dynamic allocation of noblacklist buffer
-  * --ip6 option - IPv6 support
-  * added KMail, Seamonkey, Telegram profiles
+firejail (0.9.38) baseline; urgency=low
+  * IPv6 support (--ip6 and --netfilter6)
   * --join command enhancement (--join-network, --join-filesystem)
-  * symlink invocation
   * --user command
- -- netblue30 <netblue30@yahoo.com>  Tue,  5 Jan 2016 08:00:00 -0500
+  * symlink invocation
+  * added KMail, Seamonkey, Telegram profiles
+  * bugfixes
+ -- netblue30 <netblue30@yahoo.com>  Sun,  24 Jan 2016 20:00:00 -0500
 
 firejail (0.9.36) baseline; urgency=low
   * added  unbound, dnscrypt-proxy, BitlBee, HexChat, WeeChat,
diff --git a/configure b/configure
index 46668e28a..414c70ccb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for firejail 0.9.37.
+# Generated by GNU Autoconf 2.69 for firejail 0.9.38.
 #
 # Report bugs to <netblue30@yahoo.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='firejail'
 PACKAGE_TARNAME='firejail'
-PACKAGE_VERSION='0.9.37'
-PACKAGE_STRING='firejail 0.9.37'
+PACKAGE_VERSION='0.9.38'
+PACKAGE_STRING='firejail 0.9.38'
 PACKAGE_BUGREPORT='netblue30@yahoo.com'
 PACKAGE_URL='http://firejail.wordpress.com'
 
@@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures firejail 0.9.37 to adapt to many kinds of systems.
+\`configure' configures firejail 0.9.38 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1299,7 +1299,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of firejail 0.9.37:";;
+     short | recursive ) echo "Configuration of firejail 0.9.38:";;
    esac
   cat <<\_ACEOF
 
@@ -1389,7 +1389,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-firejail configure 0.9.37
+firejail configure 0.9.38
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1691,7 +1691,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by firejail $as_me 0.9.37, which was
+It was created by firejail $as_me 0.9.38, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4107,7 +4107,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by firejail $as_me 0.9.37, which was
+This file was extended by firejail $as_me 0.9.38, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4161,7 +4161,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-firejail config.status 0.9.37
+firejail config.status 0.9.38
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6d7a09bdf..cc505ef5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT(firejail, 0.9.37, netblue30@yahoo.com, , http://firejail.wordpress.com)
+AC_INIT(firejail, 0.9.38, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index f4c448024..cad101bf9 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -136,12 +136,18 @@ void fs_build_cp_command(void) {
                         fprintf(stderr, "Error: /bin/cp not found\n");
                         exit(1);
                 }
+                if (is_link(fname)) {
+                        fprintf(stderr, "Error: invalid /bin/cp file\n");
+                        exit(1);
+                }
                 int rv = copy_file(fname, RUN_CP_COMMAND);
                 if (rv) {
                         fprintf(stderr, "Error: cannot access /bin/cp\n");
                         exit(1);
                 }
                 /* coverity[toctou] */
+                if (chown(RUN_CP_COMMAND, 0, 0))
+                        errExit("chown");
                 if (chmod(RUN_CP_COMMAND, 0755))
                         errExit("chmod");
                         
@@ -921,6 +927,10 @@ void fs_chroot(const char *rootdir) {
                 errExit("asprintf");
         if (arg_debug)
                 printf("Updating /etc/resolv.conf in %s\n", fname);
+        if (is_link(fname)) {
+                fprintf(stderr, "Error: invalid %s file\n", fname);
+                exit(1);
+        }
         if (copy_file("/etc/resolv.conf", fname) == -1)
                 fprintf(stderr, "Warning: /etc/resolv.conf not initialized\n");
                 
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 08141ed03..e42ce5255 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -41,6 +41,10 @@ static void skel(const char *homedir, uid_t u, gid_t g) {
                 if (stat(fname, &s) == 0)
                         return;
                 if (stat("/etc/skel/.zshrc", &s) == 0) {
+                        if (is_link("/etc/skel/.zshrc")) {
+                                fprintf(stderr, "Error: invalid /etc/skel/.zshrc file\n");
+                                exit(1);
+                        }
                         if (copy_file("/etc/skel/.zshrc", fname) == 0) {
                                 if (chown(fname, u, g) == -1)
                                         errExit("chown");
@@ -71,6 +75,10 @@ static void skel(const char *homedir, uid_t u, gid_t g) {
                 if (stat(fname, &s) == 0)
                         return;
                 if (stat("/etc/skel/.cshrc", &s) == 0) {
+                        if (is_link("/etc/skel/.cshrc")) {
+                                fprintf(stderr, "Error: invalid /etc/skel/.cshrc file\n");
+                                exit(1);
+                        }
                         if (copy_file("/etc/skel/.cshrc", fname) == 0) {
                                 if (chown(fname, u, g) == -1)
                                         errExit("chown");
@@ -102,6 +110,10 @@ static void skel(const char *homedir, uid_t u, gid_t g) {
                 if (stat(fname, &s) == 0)
                         return;
                 if (stat("/etc/skel/.bashrc", &s) == 0) {
+                        if (is_link("/etc/skel/.bashrc")) {
+                                fprintf(stderr, "Error: invalid /etc/skel/.bashrc file\n");
+                                exit(1);
+                        }
                         if (copy_file("/etc/skel/.bashrc", fname) == 0) {
                                 /* coverity[toctou] */
                                 if (chown(fname, u, g) == -1)
@@ -123,7 +135,12 @@ static int store_xauthority(void) {
                 errExit("asprintf");
         
         struct stat s;
-        if (stat(src, &s) == 0) {       
+        if (stat(src, &s) == 0) {
+                if (is_link(src)) {
+                        fprintf(stderr, "Error: invalid .Xauthority file\n");
+                        exit(1);
+                }
+                        
                 int rv = copy_file(src, dest);
                 if (rv) {
                         fprintf(stderr, "Warning: cannot transfer .Xauthority in private home directory\n");
@@ -146,6 +163,11 @@ static int store_asoundrc(void) {
         
         struct stat s;
         if (stat(src, &s) == 0) {       
+                if (is_link(src)) {
+                        fprintf(stderr, "Error: invalid .asoundrc file\n");
+                        exit(1);
+                }
+
                 int rv = copy_file(src, dest);
                 if (rv) {
                         fprintf(stderr, "Warning: cannot transfer .asoundrc in private home directory\n");
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 7afbf9ce3..014ea8cae 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -300,7 +300,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                 if (read_pid(argv[i] + 12, &pid) == 0)
                         bandwidth_pid(pid, cmd, dev, down, up);
                 else
-                                bandwidth_name(argv[i] + 12, cmd, dev, down, up);
+                        bandwidth_name(argv[i] + 12, cmd, dev, down, up);
                 exit(0);
         }
 
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index 29f3bc4f0..a3348baf4 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -104,6 +104,10 @@ void pulseaudio_init(void) {
         char *pulsecfg = NULL;
         if (asprintf(&pulsecfg, "%s/client.conf", RUN_PULSE_DIR) == -1)
                 errExit("asprintf");
+        if (is_link("/etc/pulse/client.conf")) {
+                fprintf(stderr, "Error: invalid /etc/pulse/client.conf file\n");
+                exit(1);
+        }
         if (copy_file("/etc/pulse/client.conf", pulsecfg))
                 errExit("copy_file");
         FILE *fp = fopen(pulsecfg, "a+");
diff --git a/src/firejail/restrict_users.c b/src/firejail/restrict_users.c
index aa6a5d268..88dd38021 100644
--- a/src/firejail/restrict_users.c
+++ b/src/firejail/restrict_users.c
@@ -115,6 +115,10 @@ static void sanitize_passwd(void) {
                 return;
         if (arg_debug)
                 printf("Sanitizing /etc/passwd\n");
+        if (is_link("/etc/passwd")) {
+                fprintf(stderr, "Error: invalid /etc/passwd\n");
+                exit(1);
+        }
 
         FILE *fpin = NULL;
         FILE *fpout = NULL;
@@ -248,6 +252,10 @@ static void sanitize_group(void) {
                 return;
         if (arg_debug)
                 printf("Sanitizing /etc/group\n");
+        if (is_link("/etc/group")) {
+                fprintf(stderr, "Error: invalid /etc/group\n");
+                exit(1);
+        }
 
         FILE *fpin = NULL;
         FILE *fpout = NULL;
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index 131f663d4..edaac7eb9 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -54,8 +54,14 @@ void shut(pid_t pid) {
                                 printf("Switching to pid %u, the first child process inside the sandbox\n", (unsigned) pid);
                         }
                 }
+                else {
+                        fprintf(stderr, "Error: this is not a firejail sandbox\n");
+                        exit(1);
+                }
                 free(comm);
         }
+        else
+                errExit("/proc/PID/comm");
 
         // check privileges for non-root users
         uid_t uid = getuid();