Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08660043 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv3: Ensure that do_proc_get_root() reports errors correctly 



If the rpc call to NFS3PROC_FSINFO fails, then we need to report that
error so that the mount fails. Otherwise we can end up with a
superblock with completely unusable values for block sizes, maxfilesize,
etc.

Reported-by: default avatarYuanming Chen <hikvision_linux@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7653f6ff

fs/nfs/nfs3proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle, 
	nfs_fattr_init(info->fattr);

	nfs_fattr_init(info->fattr);

	status = rpc_call_sync(client, &msg, 0);

	status = rpc_call_sync(client, &msg, 0);

	dprintk("%s: reply fsinfo: %d\n", __func__, status);

	dprintk("%s: reply fsinfo: %d\n", __func__, status);

	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {

	if (status == 0 && !(info->fattr->valid & NFS_ATTR_FATTR)) {

		msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR];

		msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR];

		msg.rpc_resp = info->fattr;

		msg.rpc_resp = info->fattr;

		status = rpc_call_sync(client, &msg, 0);

		status = rpc_call_sync(client, &msg, 0);