34 files changed, 173 insertions, 51 deletions

diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile
index e787a7b92..6d5c45532 100644
--- a/src/bash_completion/Makefile
+++ b/src/bash_completion/Makefile
@@ -1,9 +1,12 @@
-.PHONY: all
-all: firejail.bash_completion
+.SUFFIXES:
+MAKEFLAGS += -r
 
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+.PHONY: all
+all: firejail.bash_completion
+
 firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk
         gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
         sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@
diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile
index 10c28cd76..7c542c4a9 100644
--- a/src/etc-cleanup/Makefile
+++ b/src/etc-cleanup/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index ad73e8960..803ea18a3 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index 27054627c..29ea719a3 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fids/Makefile b/src/fids/Makefile
index 44ea396d7..1aaac5c75 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 05cc088f4..c9489e3a4 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 1e996ef72..fdda5c2c7 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -895,9 +895,10 @@ vivaldi-beta
 vivaldi-snapshot
 vivaldi-stable
 vlc
-vmware
-vmware-player
-vmware-workstation
+#vmplayer - unable to install kernel modules (see #5861)
+#vmware - unable to install kernel modules (see #5861)
+#vmware-player - unable to install kernel modules (see #5861)
+#vmware-workstation - unable to install kernel modules (see #5861)
 vscodium
 vulturesclaw
 vultureseye
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index 47edc5ac6..064373588 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 1835d8de2..070eb47f3 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2187,34 +2187,21 @@ int main(int argc, char **argv, char **envp) {
                 else if (strncmp(argv[i], "--name=", 7) == 0) {
                         cfg.name = argv[i] + 7;
                         if (strlen(cfg.name) == 0) {
-                                fprintf(stderr, "Error: please provide a name for sandbox\n");
+                                fprintf(stderr, "Error: invalid sandbox name: cannot be empty\n");
                                 return 1;
                         }
-                        if (invalid_name(cfg.name) || has_cntrl_chars(cfg.name)) {
+                        if (invalid_name(cfg.name)) {
                                 fprintf(stderr, "Error: invalid sandbox name\n");
                                 return 1;
                         }
                 }
                 else if (strncmp(argv[i], "--hostname=", 11) == 0) {
                         cfg.hostname = argv[i] + 11;
-                        size_t len = strlen(cfg.hostname);
-                        if (len == 0 || len > 253) {
-                                fprintf(stderr, "Error: please provide a valid hostname for sandbox, with maximum length of 253 ASCII characters\n");
+                        if (strlen(cfg.hostname) == 0) {
+                                fprintf(stderr, "Error: invalid hostname: cannot be empty\n");
                                 return 1;
                         }
-                        int invalid = invalid_name(cfg.hostname);
-                        char* hostname = cfg.hostname;
-                        while (*hostname && !invalid) {
-                                invalid = invalid || !(
-                                                (*hostname >= 'a' && *hostname <= 'z') ||
-                                                (*hostname >= 'A' && *hostname <= 'Z') ||
-                                                (*hostname >= '0' && *hostname <= '9') ||
-                                                (*hostname == '-' || *hostname == '.'));
-                                hostname++;
-                        }
-                        invalid = invalid || cfg.hostname[0] == '-'; // must not start with -
-                        invalid = invalid || cfg.hostname[len - 1] == '-'; // must not end with -
-                        if (invalid) {
+                        if (invalid_name(cfg.hostname)) {
                                 fprintf(stderr, "Error: invalid hostname\n");
                                 return 1;
                         }
@@ -2847,7 +2834,11 @@ int main(int argc, char **argv, char **envp) {
                         // set sandbox name and start normally
                         cfg.name = argv[i] + 16;
                         if (strlen(cfg.name) == 0) {
-                                fprintf(stderr, "Error: please provide a name for sandbox\n");
+                                fprintf(stderr, "Error: invalid sandbox name: cannot be empty\n");
+                                return 1;
+                        }
+                        if (invalid_name(cfg.name)) {
+                                fprintf(stderr, "Error: invalid sandbox name\n");
                                 return 1;
                         }
                 }
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index 22ee9dc3c..9c5e3ee58 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -120,7 +120,7 @@ int check_kernel_procs(void) {
 
                 // read file
                 char buf[100];
-                if (fgets(buf, 10, fp) == NULL) {
+                if (fgets(buf, 100, fp) == NULL) {
                         fwarning("cannot read %s\n", fname);
                         fclose(fp);
                         free(fname);
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 202bcf4da..ae881664b 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -326,22 +326,13 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         }
         // sandbox name
         else if (strncmp(ptr, "name ", 5) == 0) {
-                int only_numbers = 1;
                 cfg.name = ptr + 5;
                 if (strlen(cfg.name) == 0) {
-                        fprintf(stderr, "Error: invalid sandbox name\n");
+                        fprintf(stderr, "Error: invalid sandbox name: cannot be empty\n");
                         exit(1);
                 }
-                const char *c = cfg.name;
-                while (*c) {
-                        if (!isdigit(*c)) {
-                                only_numbers = 0;
-                                break;
-                        }
-                        ++c;
-                }
-                if (only_numbers) {
-                        fprintf(stderr, "Error: invalid sandbox name: it only contains digits\n");
+                if (invalid_name(cfg.name)) {
+                        fprintf(stderr, "Error: invalid sandbox name\n");
                         exit(1);
                 }
                 return 0;
@@ -1165,6 +1156,14 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         // hostname
         if (strncmp(ptr, "hostname ", 9) == 0) {
                 cfg.hostname = ptr + 9;
+                if (strlen(cfg.hostname) == 0) {
+                        fprintf(stderr, "Error: invalid hostname: cannot be empty\n");
+                        exit(1);
+                }
+                if (invalid_name(cfg.hostname)) {
+                        fprintf(stderr, "Error: invalid hostname\n");
+                        exit(1);
+                }
                 return 0;
         }
 
@@ -1647,6 +1646,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                         // set sandbox name and start normally
                         cfg.name = ptr + 14;
                         if (strlen(cfg.name) == 0) {
+                                fprintf(stderr, "Error: invalid sandbox name: cannot be empty\n");
+                                exit(1);
+                        }
+                        if (invalid_name(cfg.name)) {
                                 fprintf(stderr, "Error: invalid sandbox name\n");
                                 exit(1);
                         }
diff --git a/src/firejail/util.c b/src/firejail/util.c
index a0af3d4bf..555486916 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1476,23 +1476,46 @@ int ascii_isxdigit(unsigned char c) {
         return ret;
 }
 
-// allow strict ASCII letters and numbers; names with only numbers are rejected; spaces are rejected
+// Note: Keep this in sync with NAME VALIDATION in src/man/firejail.txt.
+//
+// Allow only ASCII letters, digits and a few special characters; names with
+// only numbers are rejected; spaces and control characters are rejected.
 int invalid_name(const char *name) {
         const char *c = name;
-
         int only_numbers = 1;
+
+        if (strlen(name) > 253)
+                return 1;
+
+        // must start with alnum
+        if (!ascii_isalnum(*c))
+                return 1;
+        if (!ascii_isdigit(*c))
+                only_numbers = 0;
+        ++c;
+
         while (*c) {
-                if (!ascii_isalnum(*c))
-                        return 1;
-                if (!ascii_isdigit(*c))
+                switch (*c) {
+                case '-':
+                case '.':
+                case '_':
                         only_numbers = 0;
+                        break;
+                default:
+                        if (!ascii_isalnum(*c))
+                                return 1;
+                        if (!ascii_isdigit(*c))
+                                only_numbers = 0;
+                }
                 ++c;
         }
-        if (only_numbers)
+
+        // must end with alnum
+        --c;
+        if (!ascii_isalnum(*c))
                 return 1;
 
-        // restrict name to 64 chars max
-        if (strlen(name) > 64)
+        if (only_numbers)
                 return 1;
 
         return 0;
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 433e4267d..514eb98eb 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 0c127af55..35ce019a7 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 91de109fa..a40d69b11 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index 506d287ab..fbae2e027 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index 36542f567..3c825467c 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
index 12ae42e9a..9e94fa144 100644
--- a/src/fnettrace-icmp/Makefile
+++ b/src/fnettrace-icmp/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index 8d9a437d5..21dfde3d3 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 952036ad3..a952a84a4 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index ce65f4719..40511bdaa 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index cbe061d45..6f09e9161 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 1b8d0bb48..bd5c92113 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index 2f26ab900..8b4e7fdf4 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index aeb862d9b..6b93886f5 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index e3b84fbf3..029fd422b 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/lib/Makefile b/src/lib/Makefile
index f5b92e389..e359bba08 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index 62e167b73..874de098e 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
index d45b3e2f6..d261828ea 100644
--- a/src/libtrace/Makefile
+++ b/src/libtrace/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index bfc5adddc..5e14a5dbe 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/man/Makefile b/src/man/Makefile
index 283822d1f..ce55ffd34 100644
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -1,9 +1,12 @@
-.PHONY: all
-all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
+.SUFFIXES:
+MAKEFLAGS += -r
 
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+.PHONY: all
+all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
+
 %.man: %.txt $(ROOT)/config.mk
         gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@
 
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 586ef9852..19fc94ebd 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -876,6 +876,8 @@ Print options end exit.
 \fB\-\-hostname=name
 Set sandbox hostname.
 .br
+For valid names, see the \fBNAME VALIDATION\fR section.
+.br
 
 .br
 Example:
@@ -1180,7 +1182,9 @@ Switching to pid 1932, the first child process inside the sandbox
 .TP
 \fB\-\-join-or-start=name
 Join the sandbox identified by name or start a new one.
-Same as "firejail --join=name" if sandbox with specified name exists, otherwise same as "firejail --name=name ..."
+Same as "firejail --join=name" if sandbox with specified name exists, otherwise
+same as "firejail --name=name ...".
+See \fB\-\-name\fR for details.
 .br
 Note that in contrary to other join options there is respective profile option.
 
@@ -1340,8 +1344,13 @@ $ firejail \-\-net=eth0 \-\-mtu=1492
 \fB\-\-name=name
 Set sandbox name. Several options, such as \-\-join and \-\-shutdown, can use
 this name to identify a sandbox.
-The name cannot contain only digits, as that is treated as a PID in the other options, such as in \-\-join.
+The name cannot contain only digits, as that is treated as a PID in the other
+options, such as in \-\-join.
+.br
+For valid names, see the \fBNAME VALIDATION\fR section.
+.br
 
+.br
 In case the name supplied by the user is already in use by another sandbox, Firejail will assign a
 new name as "name-PID", where PID is the process ID of the sandbox. This functionality
 can be disabled at run time in /etc/firejail/firejail.config file, by setting "name-change" flag to "no".
@@ -3296,6 +3305,17 @@ Example:
 $ firejail --net=eth0 --x11=xephyr --xephyr-screen=640x480 firefox
 .br
 #endif
+.\" Note: Keep this in sync with invalid_name() in src/firejail/util.c.
+.SH NAME VALIDATION
+For simplicity, the same name validation is used for multiple options.
+Rules:
+.PP
+The name must be 1-253 characters long.
+The name can only contain ASCII letters, digits and the special characters
+"-._" (that is, the name cannot contain spaces or control characters).
+The name cannot contain only digits.
+The first and last characters must be an ASCII letter or digit and the name
+may contain special characters in the middle.
 #ifdef HAVE_APPARMOR
 .SH APPARMOR
 .TP
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index 47b39e76c..936b575e1 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -1,3 +1,6 @@
+.SUFFIXES:
+MAKEFLAGS += -r
+
 ROOT = ../..
 -include $(ROOT)/config.mk
 
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile
index d7bc1038a..fab53ca0a 100644
--- a/src/zsh_completion/Makefile
+++ b/src/zsh_completion/Makefile
@@ -1,9 +1,12 @@
-.PHONY: all
-all: _firejail
+.SUFFIXES:
+MAKEFLAGS += -r
 
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+.PHONY: all
+all: _firejail
+
 _firejail: _firejail.in $(ROOT)/config.mk
         gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
         sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@