Merge tag 'pull-work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit aea23e7c464b · 2022-08-13T17:35:58.000-07:00
Pull /proc/mounts fix from Al Viro:
 "Fix for /proc/mounts escaping - escape the '#' character too"

* tag 'pull-work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: escape hash as well
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
@@ -86,7 +86,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt)
 
 static inline void mangle(struct seq_file *m, const char *s)
 {
-	seq_escape(m, s, " \t\n\\");
+	seq_escape(m, s, " \t\n\\#");
 }
 
 static void show_type(struct seq_file *m, struct super_block *sb)

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static void show_mnt_opts(struct seq_file m, struct vfsmount mnt)`
`86`	`86`
`87`	`87`	`static inline void mangle(struct seq_file m, const char s)`
`88`	`88`	`{`
`89`		`- seq_escape(m, s, " \t\n\\");`
	`89`	`+ seq_escape(m, s, " \t\n\\#");`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`static void show_type(struct seq_file m, struct super_block sb)`