Return-Path: Received: from mail-pf0-f194.google.com ([209.85.192.194]:43383 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751204AbeDRPTD (ORCPT ); Wed, 18 Apr 2018 11:19:03 -0400 Received: by mail-pf0-f194.google.com with SMTP id j11so1065298pff.10 for ; Wed, 18 Apr 2018 08:19:03 -0700 (PDT) From: Yecheng Fu To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, Karel Zak , Yecheng Fu Subject: [PATCH] vfs: use "none" if mount source is empty string Date: Wed, 18 Apr 2018 23:18:06 +0800 Message-Id: <1524064686-65246-1-git-send-email-cofyc.jackson@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: `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 Signed-off-by: Yecheng Fu --- 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