evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

readdir: guarantee that entry_buf_len can fit one entry

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2012-03-12 13:43:56 -04:00 • committed by Olga Kornievskaia
parent 2e1df56572
commit d69aa27295
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
daemon/readdir.c
View file

@ -457,6 +457,9 @@ static int handle_readdir(nfs41_upcall *upcall)
uint32_t entry_buf_len; uint32_t entry_buf_len;
bitmap4 attr_request; bitmap4 attr_request;
bool_t eof; bool_t eof;
/* make sure we allocate enough space for one nfs41_readdir_entry */
const uint32_t max_buf_len = max(args->buf_len,
sizeof(nfs41_readdir_entry) + NFS41_MAX_COMPONENT_SIZE);
dprintf(1, "-> handle_nfs41_dirquery(%s,%d,%d,%d)\n", dprintf(1, "-> handle_nfs41_dirquery(%s,%d,%d,%d)\n",
args->filter, args->initial, args->restart, args->single); args->filter, args->initial, args->restart, args->single);
@ -479,13 +482,13 @@ static int handle_readdir(nfs41_upcall *upcall)
goto out; goto out;
} }
entry_buf = malloc(args->buf_len); entry_buf = malloc(max_buf_len);
if (entry_buf == NULL) { if (entry_buf == NULL) {
status = GetLastError(); status = GetLastError();
goto out_free_cookie; goto out_free_cookie;
} }
fetch_entries: fetch_entries:
entry_buf_len = args->buf_len; entry_buf_len = max_buf_len;
init_getattr_request(&attr_request); init_getattr_request(&attr_request);
attr_request.arr[0] |= FATTR4_WORD0_RDATTR_ERROR; attr_request.arr[0] |= FATTR4_WORD0_RDATTR_ERROR;