aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-09-04 14:40:36 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-09-04 15:48:00 -0400
commitaed100fafb90aaabe8fb31e58af9dc7e68696507 (patch)
tree2567f2aa9f0bac26910e6d2910fbdd044a5ab8e2
parent8177e6d6dfb9cd03d9bdeb647c32161f8f58f686 (diff)
downloadmrst-s0i3-test-aed100fafb90aaabe8fb31e58af9dc7e68696507.tar.gz
mrst-s0i3-test-aed100fafb90aaabe8fb31e58af9dc7e68696507.tar.xz
mrst-s0i3-test-aed100fafb90aaabe8fb31e58af9dc7e68696507.zip
nfsd: fix leak on error in nfsv3 readdir
Note the !dchild->d_inode case can leak the filehandle. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfs3xdr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index f16184a3994..edf926e1062 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -825,7 +825,6 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
dparent = cd->fh.fh_dentry;
exp = cd->fh.fh_export;
- fh_init(fhp, NFS3_FHSIZE);
if (isdotent(name, namlen)) {
if (namlen == 2) {
dchild = dget_parent(dparent);
@@ -859,15 +858,17 @@ __be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const c
struct svc_fh fh;
int err;
+ fh_init(&fh, NFS3_FHSIZE);
err = compose_entry_fh(cd, &fh, name, namlen);
if (err) {
*p++ = 0;
*p++ = 0;
- return p;
+ goto out;
}
p = encode_post_op_attr(cd->rqstp, p, &fh);
*p++ = xdr_one; /* yes, a file handle follows */
p = encode_fh(p, &fh);
+out:
fh_put(&fh);
return p;
}