]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
cifs: Mangle string used for unc in /proc/mounts
authorSachin Prabhu <sprabhu@redhat.com>
Thu, 13 Sep 2012 16:48:57 +0000 (17:48 +0100)
committerSteve French <sfrench@us.ibm.com>
Sat, 15 Sep 2012 20:51:32 +0000 (15:51 -0500)
The string for "unc=" in /proc/mounts needs to be escaped. The current
behaviour can create problems in cases when mounting a share starting
with a number.

example:
>mount -t cifs -o username=test,password=x vm140-31:/17000-test /mnt
>mount -o remount,password=x /mnt
mount error: could not resolve address for vm140-31x00-test: Unknown
error

The sub-string "\170" which is part of the unc for the mount above in
/proc/mounts is interpreted as character'x' in the case above. Escaping
the string fixes the problem.

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/cifsfs.c

index 28ac048d54ea1af05c653f5adb50ca59ce96a941..a41044a310836cf28c65b9b8db7ab65659a54971 100644 (file)
@@ -350,7 +350,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
        cifs_show_security(s, tcon->ses->server);
        cifs_show_cache_flavor(s, cifs_sb);
 
-       seq_printf(s, ",unc=%s", tcon->treeName);
+       seq_printf(s, ",unc=");
+       seq_escape(s, tcon->treeName, " \t\n\\");
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)
                seq_printf(s, ",multiuser");