Commit 517be09d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix the referral mount code 



Fix a typo which causes try_location() to use the wrong length argument
when calling nfs_parse_server_name(). This again, causes the initialisation
of the mount's sockaddr structure to fail.

Also ensure that if nfs4_pathname_string() returns an error, then we pass
that error back up the stack instead of ENOENT.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f4373bf9

fs/nfs/nfs4namespace.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata, 




	mnt_path = nfs4_pathname_string(&location->rootpath, page2, PAGE_SIZE);

	mnt_path = nfs4_pathname_string(&location->rootpath, page2, PAGE_SIZE);

	if (IS_ERR(mnt_path))

	if (IS_ERR(mnt_path))

		return mnt;

		return ERR_CAST(mnt_path);

	mountdata->mnt_path = mnt_path;

	mountdata->mnt_path = mnt_path;

	maxbuflen = mnt_path - 1 - page2;

	maxbuflen = mnt_path - 1 - page2;
@@ -132,15 +132,15 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata, 
		if (buf->len <= 0 || buf->len >= maxbuflen)

		if (buf->len <= 0 || buf->len >= maxbuflen)

			continue;

			continue;





		mountdata->addr = (struct sockaddr *)&addr;



		if (memchr(buf->data, IPV6_SCOPE_DELIMITER, buf->len))

		if (memchr(buf->data, IPV6_SCOPE_DELIMITER, buf->len))

			continue;

			continue;

		mountdata->addrlen = nfs_parse_server_name(buf->data,



				buf->len,

		mountdata->addrlen = nfs_parse_server_name(buf->data, buf->len,

				mountdata->addr, mountdata->addrlen);

				(struct sockaddr *)&addr, sizeof(addr));

		if (mountdata->addrlen == 0)

		if (mountdata->addrlen == 0)

			continue;

			continue;



		mountdata->addr = (struct sockaddr *)&addr;

		rpc_set_port(mountdata->addr, NFS_PORT);

		rpc_set_port(mountdata->addr, NFS_PORT);





		memcpy(page2, buf->data, buf->len);

		memcpy(page2, buf->data, buf->len);