diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2012-09-06 15:54:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:30:19 -0700 |
| commit | 6da04d620105c54d37de139f9b09e62196b5d0c3 (patch) | |
| tree | fe776a918a67cf9eb0e05425bc2af517c87df3f3 /fs | |
| parent | 3672dff93b8c5c7d2ebaf18eb32c98b06e942dac (diff) | |
| download | linux-stable-6da04d620105c54d37de139f9b09e62196b5d0c3.tar.gz linux-stable-6da04d620105c54d37de139f9b09e62196b5d0c3.tar.bz2 linux-stable-6da04d620105c54d37de139f9b09e62196b5d0c3.zip | |
NFS: return error from decode_getfh in decode open
commit 01913b49cf1dc6409a07dd2a4cc6af2e77f3c410 upstream.
If decode_getfh failed, nfs4_xdr_dec_open would return 0 since the last
decode_* call must have succeeded.
Signed-off-by: Weston Andros Adamson <dros@netapp.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/nfs4xdr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index c54aae364bee..c8ac9a1461c2 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -6081,7 +6081,8 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status = decode_open(xdr, res); if (status) goto out; - if (decode_getfh(xdr, &res->fh) != 0) + status = decode_getfh(xdr, &res->fh); + if (status) goto out; if (decode_getfattr(xdr, res->f_attr, res->server) != 0) goto out; |