Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Siddhesh Poyarekar <siddhesh@gotplt.org>
To:     linux-fsdevel@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        Alexander Viro <viro@zeniv.linux.org.uk>, siddhesh@gotplt.org,
        Florian Weimer <fweimer@redhat.com>
Subject: [RESEND][PATCH v3] proc: Escape more characters in /proc/mounts output
Date:   Thu,  7 Jan 2021 15:41:13 +0530
Message-Id: <20210107101113.368139-1-siddhesh@gotplt.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

When a filesystem is mounted with a blank name like so:

 # mount '' bad -t tmpfs

its name entry in /proc/mounts is blank causing the line to start
with a space.

 /mnt/bad tmpfs rw,seclabel,relatime,inode64 0 0

Further, the name could start with a hash, causing the entry to look
like this (leading space added so that git does not strip it out):

 # /mnt/bad tmpfs rw,seclabel,relatime,inode64 0 0

This breaks getmntent and any code that aims to parse fstab as well as
/proc/mounts with the same logic since they need to strip leading
spaces or skip over comments, due to which they report incorrect
output or skip over the line respectively.

This fix resolves both issues by (1) treating blank names the same way
as not having a name and (2) by escaping the hash character into its
octal encoding, which getmntent can then decode and print correctly.
As far as file parsing is concerned, these are the only additional
cases to cater for since they cover all characters that have a special
meaning in that context.

Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
Cc: Florian Weimer <fweimer@redhat.com>
---
 fs/namespace.c      | 5 +++++
 fs/proc_namespace.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index d2db7dfe232b..2f81f1c7f20a 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3421,6 +3421,11 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, ch=
ar __user *, dir_name,
 	if (IS_ERR(kernel_dev))
 		goto out_dev;
=20
+	if (kernel_dev && !kernel_dev[0]) {
+		kfree(kernel_dev);
+		kernel_dev =3D NULL;
+	}
+
 	options =3D copy_mount_options(data);
 	ret =3D PTR_ERR(options);
 	if (IS_ERR(options))
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index eafb75755fa3..6d7e47750781 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -83,7 +83,7 @@ static void show_mnt_opts(struct seq_file *m, struct vf=
smount *mnt)
=20
 static inline void mangle(struct seq_file *m, const char *s)
 {
-	seq_escape(m, s, " \t\n\\");
+	seq_escape(m, s, " \t\n\\#");
 }
=20
 static void show_type(struct seq_file *m, struct super_block *sb)
--=20
2.29.2