linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yecheng Fu <cofyc.jackson@gmail.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org, Karel Zak <kzak@redhat.com>,
	Yecheng Fu <cofyc.jackson@gmail.com>
Subject: [PATCH] vfs: use "none" if mount source is empty string
Date: Wed, 18 Apr 2018 23:18:06 +0800	[thread overview]
Message-ID: <1524064686-65246-1-git-send-email-cofyc.jackson@gmail.com> (raw)

`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.

Cc: Karel Zak <kzak@redhat.com>
Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
---
 fs/proc_namespace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 3f1190d..0aa16a0 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -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);
-- 
Yecheng Fu

             reply	other threads:[~2018-04-18 15:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-18 15:18 Yecheng Fu [this message]
2018-04-18 15:28 ` [PATCH] vfs: use "none" if mount source is empty string Matthew Wilcox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524064686-65246-1-git-send-email-cofyc.jackson@gmail.com \
    --to=cofyc.jackson@gmail.com \
    --cc=kzak@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).