small private-cwd adjustments

5 files changed, 21 insertions, 12 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index f904d65d2..bb5eb50fb 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -524,7 +524,7 @@ void fs_private_homedir(void);
 // check new private home directory (--private= option) - exit if it fails
 void fs_check_private_dir(void);
 // check new private working directory (--private-cwd= option) - exit if it fails
-void fs_check_private_cwd(void);
+void fs_check_private_cwd(const char *dir);
 void fs_private_home_list(void);
 
 
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index a1a16841a..3f6d78db4 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -371,15 +371,15 @@ void fs_check_private_dir(void) {
 }
 
 // check new private working directory (--private-cwd= option) - exit if it fails
-void fs_check_private_cwd(void) {
+void fs_check_private_cwd(const char *dir) {
         EUID_ASSERT();
-        invalid_filename(cfg.cwd, 0); // no globbing
+        invalid_filename(dir, 0); // no globbing
 
         // Expand the working directory
-        cfg.cwd = expand_macros(cfg.cwd);
+        cfg.cwd = expand_macros(dir);
 
         // realpath/is_dir not used because path may not exist outside of jail
-        if (!cfg.cwd) {
+        if (strstr(cfg.cwd, "..")) {
                 fprintf(stderr, "Error: invalid private working directory\n");
                 exit(1);
         }
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 7ac88f5a5..4b46bc8ae 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -632,6 +632,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
         else if (strncmp(argv[i], "--get=", 6) == 0) {
                 if (checkcfg(CFG_FILE_TRANSFER)) {
                         logargs(argc, argv);
+                        if (arg_private_cwd) {
+                                fprintf(stderr, "Error: --get and --private-cwd options are mutually exclusive\n");
+                                exit(1);
+                        }
 
                         // verify path
                         if ((i + 2) != argc) {
@@ -656,6 +660,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
         else if (strncmp(argv[i], "--put=", 6) == 0) {
                 if (checkcfg(CFG_FILE_TRANSFER)) {
                         logargs(argc, argv);
+                        if (arg_private_cwd) {
+                                fprintf(stderr, "Error: --put and --private-cwd options are mutually exclusive\n");
+                                exit(1);
+                        }
 
                         // verify path
                         if ((i + 3) != argc) {
@@ -686,6 +694,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
         else if (strncmp(argv[i], "--ls=", 5) == 0) {
                 if (checkcfg(CFG_FILE_TRANSFER)) {
                         logargs(argc, argv);
+                        if (arg_private_cwd) {
+                                fprintf(stderr, "Error: --ls and --private-cwd options are mutually exclusive\n");
+                                exit(1);
+                        }
 
                         // verify path
                         if ((i + 2) != argc) {
@@ -1780,13 +1792,12 @@ int main(int argc, char **argv) {
                         arg_private_cwd = 1;
                 }
                 else if (strncmp(argv[i], "--private-cwd=", 14) == 0) {
-                        cfg.cwd = argv[i] + 14;
-                        if (*cfg.cwd == '\0') {
+                        if (*(argv[i] + 14) == '\0') {
                                 fprintf(stderr, "Error: invalid private-cwd option\n");
                                 exit(1);
                         }
 
-                        fs_check_private_cwd();
+                        fs_check_private_cwd(argv[i] + 14);
                         arg_private_cwd = 1;
                 }
 
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 8d228fae6..99d83c16a 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -359,9 +359,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 return 0;
         }
         else if (strncmp(ptr, "private-cwd ", 12) == 0) {
-                cfg.cwd = strdup(ptr + 12);
-
-                fs_check_private_cwd();
+                fs_check_private_cwd(ptr + 12);
                 arg_private_cwd = 1;
                 return 0;
         }
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 58245fa38..2c5c5fc12 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -1020,7 +1020,7 @@ int sandbox(void* sandbox_arg) {
                 if (chdir(cfg.cwd) == 0)
                         cwd = 1;
                 else if (arg_private_cwd) {
-                        fprintf(stderr, "Error: unabled to enter private working directory: %s: %s\n", cfg.cwd, strerror(errno));
+                        fprintf(stderr, "Error: unable to enter private working directory: %s: %s\n", cfg.cwd, strerror(errno));
                         exit(1);
                 }
         }