Commit aea23e7c authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents 332019e2 ed5fce76
...@@ -86,7 +86,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt) ...@@ -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) 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) static void show_type(struct seq_file *m, struct super_block *sb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment