From fb5174949f1d764cd0e1b51758f86bddcb3381d4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 7 Mar 2010 00:16:41 -0500 Subject: [PATCH] mount: properly ignore comments in /etc/filesystems The POSIX spec for sscanf() says that whitespace may be matched against 0 bytes which means doing sscanf(" %s") against "#foo" will result in a match. You can see this behavior by using the verbose options on a garbage file: ... mount: you didn't specify a filesystem type for /dev/null I will try all types mentioned in /etc/filesystems or /proc/filesystems Trying # mount: mount(2) syscall: source: "/dev/null", target: "/", filesystemtype: "#", mountflags: -1058209792, data: (null) Trying #vfat mount: mount(2) syscall: source: "/dev/null", target: "/", filesystemtype: "#vfat", mountflags: -1058209792, data: (null) ... Reported-by: Dave Barton Signed-off-by: Mike Frysinger --- mount/mount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mount/mount.c b/mount/mount.c index efe11654..45f96991 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -767,8 +767,8 @@ procfsnext(FILE *procfs) { char fsname[100]; while (fgets(line, sizeof(line), procfs)) { - if (sscanf (line, "nodev %[^\n]\n", fsname) == 1) continue; - if (sscanf (line, " %[^ \n]\n", fsname) != 1) continue; + if (sscanf (line, "nodev %[^#\n]\n", fsname) == 1) continue; + if (sscanf (line, " %[^# \n]\n", fsname) != 1) continue; return xstrdup(fsname); } return 0; -- 2.39.5