aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-09-03 01:09:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 08:56:31 -0700
commitcb2fee3223eaaeaab386d635fa905ad3925ca539 (patch)
tree23da9b0d4ef88ff4dff8f666321a0986a8eedf20 /fs/nfs
parentf1c84a5cb52ee2915457b481c756fcc1dfe6a471 (diff)
downloadkernel_samsung_smdk4412-cb2fee3223eaaeaab386d635fa905ad3925ca539.tar.gz
kernel_samsung_smdk4412-cb2fee3223eaaeaab386d635fa905ad3925ca539.tar.bz2
kernel_samsung_smdk4412-cb2fee3223eaaeaab386d635fa905ad3925ca539.zip
nfs: Enclose hostname in brackets when needed in nfs_do_root_mount
commit 98a2139f4f4d7b5fcc3a54c7fddbe88612abed20 upstream. When hostname contains colon (e.g. when it is an IPv6 address) it needs to be enclosed in brackets to make parsing of NFS device string possible. Fix nfs_do_root_mount() to enclose hostname properly when needed. NFS code actually does not need this as it does not parse the string passed by nfs_do_root_mount() but the device string is exposed to userspace in /proc/mounts. CC: Josh Boyer <jwboyer@redhat.com> CC: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 7e8b07d4fa0..8e7b61d5829 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2694,11 +2694,15 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
char *root_devname;
size_t len;
- len = strlen(hostname) + 3;
+ len = strlen(hostname) + 5;
root_devname = kmalloc(len, GFP_KERNEL);
if (root_devname == NULL)
return ERR_PTR(-ENOMEM);
- snprintf(root_devname, len, "%s:/", hostname);
+ /* Does hostname needs to be enclosed in brackets? */
+ if (strchr(hostname, ':'))
+ snprintf(root_devname, len, "[%s]:/", hostname);
+ else
+ snprintf(root_devname, len, "%s:/", hostname);
root_mnt = vfs_kern_mount(fs_type, flags, root_devname, data);
kfree(root_devname);
return root_mnt;