Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec016e3 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 67db1034

fs/nfsd/nfs4xdr.c

+4 −3
Original line number Diff line number Diff line
@@ -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;