Skip to content

Commit b3a9cba

Browse files
neilbrownopsiff
authored andcommitted
nfsd: fix refcount leak in nfsd_set_fh_dentry()
commit 8a7348a upstream. nfsd exports a "pseudo root filesystem" which is used by NFSv4 to find the various exported filesystems using LOOKUP requests from a known root filehandle. NFSv3 uses the MOUNT protocol to find those exported filesystems and so is not given access to the pseudo root filesystem. If a v3 (or v2) client uses a filehandle from that filesystem, nfsd_set_fh_dentry() will report an error, but still stores the export in "struct svc_fh" even though it also drops the reference (exp_put()). This means that when fh_put() is called an extra reference will be dropped which can lead to use-after-free and possible denial of service. Normal NFS usage will not provide a pseudo-root filehandle to a v3 client. This bug can only be triggered by the client synthesising an incorrect filehandle. To fix this we move the assignments to the svc_fh later, after all possible error cases have been detected. Reported-and-tested-by: tianshuo han <hantianshuo233@gmail.com> Fixes: ef7f6c4 ("nfsd: move V4ROOT version check to nfsd_set_fh_dentry()") Signed-off-by: NeilBrown <neil@brown.name> Reviewed-by: Jeff Layton <jlayton@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit b6bc86ce3944b10b9fc181fc00c1a520a20ed965) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 16ca585 commit b3a9cba

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fs/nfsd/nfsfh.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,6 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct net *net,
268268
dentry);
269269
}
270270

271-
fhp->fh_dentry = dentry;
272-
fhp->fh_export = exp;
273-
274271
switch (fhp->fh_maxsize) {
275272
case NFS4_FHSIZE:
276273
if (dentry->d_sb->s_export_op->flags & EXPORT_OP_NOATOMIC_ATTR)
@@ -292,6 +289,9 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct net *net,
292289
goto out;
293290
}
294291

292+
fhp->fh_dentry = dentry;
293+
fhp->fh_export = exp;
294+
295295
return 0;
296296
out:
297297
exp_put(exp);

0 commit comments

Comments
 (0)