diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-04 17:59:32 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-04 17:59:32 +0200 |
| commit | 1be10a88cac5e589cdd2bcb0cf6a13ed30bcc233 (patch) | |
| tree | 2d4b7fe5a1d45162d38388206772644486cd1328 /fs/nfsd/nfsfh.c | |
| parent | NFSd: Fix filehandle leak in exp_pseudoroot() and nfsd4_path() (diff) | |
| download | linux-1be10a88cac5e589cdd2bcb0cf6a13ed30bcc233.tar.xz linux-1be10a88cac5e589cdd2bcb0cf6a13ed30bcc233.zip | |
nfsd4: filehandle leak or error exit from fh_compose()
A number of callers (nfsd4_encode_fattr(), at least) don't bother to
release the filehandle returned to fh_compose() if fh_compose() returns
an error. So, modify fh_compose() to release the filehandle before
returning an error.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfsfh.c')
| -rw-r--r-- | fs/nfsd/nfsfh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index bce0b2bfbc61..01965b2f3a76 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -557,8 +557,10 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, if (inode) _fh_update(fhp, exp, dentry); - if (fhp->fh_handle.fh_fileid_type == 255) + if (fhp->fh_handle.fh_fileid_type == 255) { + fh_put(fhp); return nfserr_opnotsupp; + } } return 0; |