vfs: use "none" if mount source is empty string
PATCH 1/1 vfs: use "none" if mount source is empty string
libmount from util-linux and many softwares in userspace (e.g. kubelet) did not expect empty string as mount source:
``` $ mount -t tmpfs "" /mnt/tmpfs $ findmnt /mnt/tmpfs findmnt: /proc/self/mountinfo: parse error at line 51 $ cat /proc/self/mountinfo | grep -P '\/mnt\/tmpfs' 74 25 0:59 / /mnt/tmpfs rw,relatime shared:38 - tmpfs rw $ cat /proc/self/mounts | grep -P '\/mnt\/tmpfs' /mnt/tmpfs tmpfs rw,relatime 0 0 ```
source field in mounts/mountinfo is empty, which breaks a lot of mounts/mountinfo parsers when user use empty string as mount source.
This fixes issues in parsing when user use empty string as mount source.
--- fs/proc_namespace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/proc_namespace.c +2 -2
@@ -104,7 +104,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)if (err) goto out; }else { -mangle (m, r->mnt_devname ? r->mnt_devname :"none" ); +mangle (m, (r->mnt_devname && r->mnt_devname[0 ] !='\0' ) ? r->mnt_devname :"none" ); }seq_putc (m,' ' );/* mountpoints outside of chroot jail will give SEQ_SKIP on this */
@@ -174,7 +174,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)if (err) goto out; }else { -mangle (m, r->mnt_devname ? r->mnt_devname :"none" ); +mangle (m, (r->mnt_devname && r->mnt_devname[0 ] !='\0' ) ? r->mnt_devname :"none" ); }seq_puts (m, sb->s_flags &MS_RDONLY ?" ro" :" rw" ); err =show_sb_opts (m, sb);
Signature · 1 line
Yecheng Fu
Quoted 13 lines · Yecheng Fu
libmountfrom util-linux and many softwares in userspace (e.g. kubelet) did not expect empty string as mount source:``` $ mount -t tmpfs "" /mnt/tmpfs $ findmnt /mnt/tmpfs findmnt: /proc/self/mountinfo: parse error at line 51 $ cat /proc/self/mountinfo | grep -P '\/mnt\/tmpfs' 74 25 0:59 / /mnt/tmpfs rw,relatime shared:38 - tmpfs rw $ cat /proc/self/mounts | grep -P '\/mnt\/tmpfs' /mnt/tmpfs tmpfs rw,relatime 0 0 ```
Quoted 8 lines
sourcefield in mounts/mountinfo is empty, which breaks a lot of mounts/mountinfo parsers when user use empty string as mount source.This fixes issues in parsing when user use empty string as mount source.
Cc Karel Zak <[email protected]>Signed-off-by Yecheng Fu <[email protected]>
What about show_vfsstat()? Doesn't it need:
+++ b/fs/proc_namespace.c
@@ -205,7 +205,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
if (err)
goto out;
} else {
- if (r->mnt_devname) {
+ if (r->mnt_devname && r->mnt_devname[0] != '\0') {
seq_puts(m, "device ");
mangle(m, r->mnt_devname);
} else