diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-08-20 12:42:15 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-08-20 12:52:42 -0400 |
| commit | 086600430493e04b802bee6e5b3ce0458e4eb77f (patch) | |
| tree | 56de6150c707126b788e8ad6543e0904a2205e0f | |
| parent | 7653f6ff4ebab2a094e65b60fb19ee66ed2f78e7 (diff) | |
| download | linux-3.10-086600430493e04b802bee6e5b3ce0458e4eb77f.tar.gz linux-3.10-086600430493e04b802bee6e5b3ce0458e4eb77f.tar.bz2 linux-3.10-086600430493e04b802bee6e5b3ce0458e4eb77f.zip | |
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: Yuanming Chen <hikvision_linux@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/nfs3proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 0952c791df3..d6b3b5f2d77 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -69,7 +69,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle, nfs_fattr_init(info->fattr); status = rpc_call_sync(client, &msg, 0); 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_resp = info->fattr; status = rpc_call_sync(client, &msg, 0); |