Merge pull request #713 from i-MSCP/master

Fixed #712

2 files changed, 21 insertions, 9 deletions

diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 5fe31cec8..98b661028 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1110,13 +1110,16 @@ int fs_check_chroot_dir(const char *rootdir) {
         }
         free(name);
 
-        // check shell
-        if (!arg_shell_none) {
-                if (stat(cfg.shell, &s) == -1) {
-                        fprintf(stderr, "Error: cannot find %s in chroot directory\n", cfg.shell);
-                        return 1;
-                }
-        }
+        // check shell (test not needed. We already test access in main.c)
+        //if (!arg_shell_none) {
+        //      if (asprintf(&name, "%s%s", rootdir, (char *)&cfg.shell) == -1)
+        //              errExit("asprintf");
+        //      if (stat(name, &s) == -1) {
+        //              fprintf(stderr, "Error: cannot find %s in chroot directory\n", name);
+        //              return 1;
+        //      }
+        //      free(name);
+        //}
 
         // check x11 socket directory
         if (getenv("FIREJAIL_X11")) {
diff --git a/src/firejail/main.c b/src/firejail/main.c
index fbffedbde..3e5663a9b 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1956,9 +1956,18 @@ EUID_USER();
                                 fprintf(stderr, "Error: invalid shell\n");
                                 exit(1);
                         }
-                        
+
                         // access call checks as real UID/GID, not as effective UID/GID
-                        if (access(cfg.shell, R_OK)) {
+                        if(cfg.chrootdir) {
+                                char *shellpath;
+                                if (asprintf(&shellpath, "%s%s", cfg.chrootdir, cfg.shell) == -1)
+                                        errExit("asprintf");
+                                if (access(shellpath, R_OK)) {
+                                        fprintf(stderr, "Error: cannot access shell file in chroot\n");
+                                        exit(1);
+                                }
+                                free(shellpath);
+                        } else if (access(cfg.shell, R_OK)) {
                                 fprintf(stderr, "Error: cannot access shell file\n");
                                 exit(1);
                         }