forked from Minki/linux
nfsd: make nfs4xdr WRITEMEM safe against zero count
WRITEMEM zeroes the last word in the destination buffer for padding purposes, but this must not be done if no bytes are to be copied, as it would result in zeroing of the word right before the array. The current implementation works since it's always called with non zero nbytes or it follows an encoding of the string (or opaque) length which, if equal to zero, can be overwritten with zero. Nevertheless, it seems safer to check for this case. Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
3b12cd9862
commit
13b1867cac
@ -1201,7 +1201,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
|
||||
*p++ = htonl((u32)((n) >> 32)); \
|
||||
*p++ = htonl((u32)(n)); \
|
||||
} while (0)
|
||||
#define WRITEMEM(ptr,nbytes) do { \
|
||||
#define WRITEMEM(ptr,nbytes) do if (nbytes > 0) { \
|
||||
*(p + XDR_QUADLEN(nbytes) -1) = 0; \
|
||||
memcpy(p, ptr, nbytes); \
|
||||
p += XDR_QUADLEN(nbytes); \
|
||||
|
Loading…
Reference in New Issue
Block a user