diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-12-20 00:01:35 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-01-07 20:48:10 +0100 |
| commit | 0ec016e3e02fe07e7250b87daffab611f219e7f1 (patch) | |
| tree | 220f651e1ee2843b7c6b2fda5e1d9d99dd6ec0a5 | |
| parent | nfsd: fi_delegees doesn't need to be an atomic_t (diff) | |
| download | linux-0ec016e3e02fe07e7250b87daffab611f219e7f1.tar.xz linux-0ec016e3e02fe07e7250b87daffab611f219e7f1.zip | |
nfsd4: tweak rd_dircount accounting
RFC 3530 14.2.24 says
This value represents the length of the names of the directory
entries and the cookie value for these entries. This length
represents the XDR encoding of the data (names and cookies)...
The "xdr encoding" of the name should probably include the 4 bytes for
the length.
But this is all just a hint so not worth e.g. backporting to stable.
Also reshuffle some lines to more clearly group together the
dircount-related code.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 15f7b73e0c0f..91f7a3644ffb 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2768,16 +2768,17 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, if (entry_bytes > cd->rd_maxcount) goto fail; cd->rd_maxcount -= entry_bytes; - if (!cd->rd_dircount) - goto fail; /* * RFC 3530 14.2.24 describes rd_dircount as only a "hint", so * let's always let through the first entry, at least: */ - name_and_cookie = 4 * XDR_QUADLEN(namlen) + 8; + if (!cd->rd_dircount) + goto fail; + name_and_cookie = 4 + 4 * XDR_QUADLEN(namlen) + 8; if (name_and_cookie > cd->rd_dircount && cd->cookie_offset) goto fail; cd->rd_dircount -= min(cd->rd_dircount, name_and_cookie); + cd->cookie_offset = cookie_offset; skip_entry: cd->common.err = nfs_ok; |