fix sandbox name resolution, issue #1819

1 files changed, 30 insertions, 0 deletions

diff --git a/src/firejail/run_files.c b/src/firejail/run_files.c
index 57a0e19df..361ad1414 100644
--- a/src/firejail/run_files.c
+++ b/src/firejail/run_files.c
@@ -20,6 +20,7 @@
 
 #include "firejail.h"
 #include "../include/pid.h"
+#define BUFLEN 4096
 
 static void delete_x11_run_file(pid_t pid) {
         char *fname;
@@ -74,7 +75,36 @@ void delete_run_files(pid_t pid) {
         delete_profile_run_file(pid);
 }
 
+static char *newname(char *name) {
+        char *rv;
+        pid_t pid;
+
+        // try the name
+        if (name2pid(name, &pid))
+                return name;
+
+        // try name-1 to 9
+        int i;
+        for (i = 1; i < 10; i++) {
+                if (asprintf(&rv, "%s-%d", name, i) == -1)
+                        errExit("asprintf");
+                if (name2pid(rv, &pid)) {
+                        fwarning("Sandbox name changed to %s\n", rv);
+                        return rv;
+                }
+                free(rv);
+        }
+
+        // return name-pid
+        if (asprintf(&rv, "%s-%d", name, getpid()) == -1)
+                errExit("asprintf");
+        return rv;
+}
+
+
 void set_name_run_file(pid_t pid) {
+        cfg.name = newname(cfg.name);
+
         char *fname;
         if (asprintf(&fname, "%s/%d", RUN_FIREJAIL_NAME_DIR, pid) == -1)
                 errExit("asprintf");