fs_whitelist: minor mountinfo check improvement, cleanup

1 files changed, 3 insertions, 3 deletions

diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 1092268f9..829636b9c 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -303,7 +303,9 @@ static void whitelist_path(ProfileEntry *entry) {
 
         // confirm the file was mounted on the right target
         // strcmp does not work here, because mptr->dir can be a child mount
-        if (strncmp(mptr->dir, path, strlen(path)) != 0)
+        size_t path_len = strlen(path);
+        if (strncmp(mptr->dir, path, path_len) != 0 ||
+           (*(mptr->dir + path_len) != '\0' && *(mptr->dir + path_len) != '/'))
                 errLogExit("invalid whitelist mount");
         // No mounts are allowed on top level directories. A destination such as "/etc" is very bad!
         //  - there should be more than one '/' char in dest string
@@ -326,8 +328,6 @@ static void whitelist_path(ProfileEntry *entry) {
 
 
 void fs_whitelist(void) {
-        char *homedir = cfg.homedir;
-        assert(homedir);
         ProfileEntry *entry = cfg.profile;
         if (!entry)
                 return;