diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-08-20 12:42:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 10:00:38 -0700 |
| commit | 9516c03e553f8947ab63592a42e0a6b381a690bf (patch) | |
| tree | 92c8155678c470098d5fd3e2ecf5ff3643f1bb1f /fs | |
| parent | 8959204efe267c97135cd3d466b1de068845e33e (diff) | |
| download | linux-stable-9516c03e553f8947ab63592a42e0a6b381a690bf.tar.gz linux-stable-9516c03e553f8947ab63592a42e0a6b381a690bf.tar.bz2 linux-stable-9516c03e553f8947ab63592a42e0a6b381a690bf.zip | |
NFSv3: Ensure that do_proc_get_root() reports errors correctly
commit 086600430493e04b802bee6e5b3ce0458e4eb77f upstream.
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>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -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 771741f14799..edfca53059b7 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -68,7 +68,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); |