vfs: use "none" if mount source is empty string
PATCH v2 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.
This fixes issues in parsing when user uses empty string as mount source.
---
PATCH v2 updates show_vfsstat() too.
fs/proc_namespace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/proc_namespace.c +3 -3
@@ -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);
@@ -202,7 +202,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
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.This fixes issues in parsing when user uses empty string as mount source.
Cc Karel Zak <[email protected]>Signed-off-by Yecheng Fu <[email protected]>
Quoted 17 lines · Matthew Wilcox
Quoted 16 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 ```
sourcefield in mounts/mountinfo is empty, which breaks a lot of mounts/mountinfo parsers.
Quoted 7 lines
Quoted 5 lines
This fixes issues in parsing when user uses empty string as mount source.
Cc Karel Zak <[email protected]>Signed-off-by Yecheng Fu <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>
hi, I'm a newbie here. Will this be merged or is there still something I need to do?
I had submitted a patch to [util-linux](https://github.com/karelzak/util-linux/pull/619). Karel prefer kernel side bugfix than rewrite all the sscanf() stuff and I agree. Kernel side bugfix also fixes all parsers too.
Signature · 1 line
Yecheng Fu
Quoted 24 lines · Yecheng Fu
Quoted 23 lines · Matthew Wilcox
Quoted 21 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 ```
sourcefield in mounts/mountinfo is empty, which breaks a lot of mounts/mountinfo parsers.This fixes issues in parsing when user uses empty string as mount source.
Cc Karel Zak <[email protected]>Signed-off-by Yecheng Fu <[email protected]>
Quoted 9 lines
Quoted 1 line
Reviewed-by Matthew Wilcox <[email protected]>hi, I'm a newbie here. Will this be merged or is there still something I need to do?
I had submitted a patch to [util-linux](https://github.com/karelzak/util-linux/pull/619). Karel prefer kernel side bugfix than rewrite all the
sscanf()stuff and I agree. Kernel side bugfix also fixes all parsers too.Signature · 1 line
Yecheng Fu
hi, didn't receive any updates for months, sorry to ping again in case someone missed it.
Karel patched util-linux to work around this issue now [^1], but I hope this can be fixed on kernel side too to improve compatibility.
[^1]: https://github.com/karelzak/util-linux/commit/18a52a5094f820b5da013daf5972eb8e65be9680
Signature · 1 line
Yecheng Fu
Quoted 32 lines · Yecheng Fu
Quoted 31 lines · Yecheng Fu
Quoted 17 lines · Matthew Wilcox
Quoted 16 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 ```
sourcefield in mounts/mountinfo is empty, which breaks a lot of mounts/mountinfo parsers.Quoted 7 lines
Quoted 5 lines
This fixes issues in parsing when user uses empty string as mount source.
Cc Karel Zak <[email protected]>Signed-off-by Yecheng Fu <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>hi, I'm a newbie here. Will this be merged or is there still something I need to do?
I had submitted a patch to [util-linux](https://github.com/karelzak/util-linux/pull/619). Karel prefer kernel side bugfix than rewrite all the
sscanf()stuff and I agree. Kernel side bugfix also fixes all parsers too.
Quoted 8 lines
Quoted 2 lines
Signature · 1 line
Yecheng Fuhi, didn't receive any updates for months, sorry to ping again in case someone missed it.
Karel patched util-linux to work around this issue now [^1], but I hope this can be fixed on kernel side too to improve compatibility.
I agree. I'm absolutely sure that in userspace are many many another places where nobody expects empty mount source in /proc/self/mountinfo. It would be really nice to use there "none" as placeholder.
Karel
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com