diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-19 13:01:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-19 13:01:50 -0800 |
| commit | f419f031de1498765b64ddf71590f40689a9b55c (patch) | |
| tree | e0289c46686011d6fb575b309f4ad8eda62904dc /fs | |
| parent | 28df858033484b830c2ea146c03da67d2d659405 (diff) | |
| parent | 5f39d2713bd80e8a3e6d9299930aec8844872c0e (diff) | |
| download | linux-f419f031de1498765b64ddf71590f40689a9b55c.tar.bz2 | |
Merge tag 'nfsd-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Avoid exposing parent of root directory in NFSv3 READDIRPLUS results
- Fix a tracepoint change that went in the initial 5.11 merge
* tag 'nfsd-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
SUNRPC: Move the svc_xdr_recvfrom tracepoint again
nfsd4: readdirplus shouldn't return parent of export
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs3xdr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 821db21ba072..34b880211e5e 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -865,9 +865,14 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp, if (isdotent(name, namlen)) { if (namlen == 2) { dchild = dget_parent(dparent); - /* filesystem root - cannot return filehandle for ".." */ + /* + * Don't return filehandle for ".." if we're at + * the filesystem or export root: + */ if (dchild == dparent) goto out; + if (dparent == exp->ex_path.dentry) + goto out; } else dchild = dget(dparent); } else |