small fixes

3 files changed, 12 insertions, 6 deletions

diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 92cf4c1bc..df5e8410b 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -580,12 +580,14 @@ void fs_proc_sys_dev_boot(void) {
         /* Mount a version of /sys that describes the network namespace */
         if (arg_debug)
                 printf("Remounting /sys directory\n");
-        if (umount2("/sys", MNT_DETACH) < 0) 
+        if (umount2("/sys", MNT_DETACH) < 0)
                 fprintf(stderr, "Warning: failed to unmount /sys\n");
-        if (mount("sysfs", "/sys", "sysfs", MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REC, NULL) < 0)
-                fprintf(stderr, "Warning: failed to mount /sys\n");
-        else
-                fs_logger("remount /sys");
+        else {
+                if (mount("sysfs", "/sys", "sysfs", MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REC, NULL) < 0)
+                        fprintf(stderr, "Warning: failed to mount /sys\n");
+                else
+                        fs_logger("remount /sys");
+        }
                 
         if (stat("/sys/firmware", &s) == 0) {
                 disable_file(BLACKLIST_FILE, "/sys/firmware");
diff --git a/src/firejail/main.c b/src/firejail/main.c
index fe4027a55..f02da66aa 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -142,7 +142,7 @@ static inline Bridge *last_bridge_configured(void) {
 }
 
 // return 1 if error, 0 if a valid pid was found
-static int read_pid(char *str, pid_t *pid) {
+static inline int read_pid(char *str, pid_t *pid) {
         char *endptr;
         errno = 0;
         long int pidtmp = strtol(str, &endptr, 10);
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 112454396..ba287027c 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -363,6 +363,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                         fprintf(stderr, "Error: invalid file name.\n");
                         exit(1);
                 }
+                if (is_link(dname1) || is_link(dname2)) {
+                        fprintf(stderr, "Symbolic links are not allowed for bind command\n");
+                        exit(1);
+                }
                 
                 // insert comma back
                 *(dname2 - 1) = ',';