diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
tree | 6bbc2806756924105802f4584157396fb98d282c /net/sunrpc | |
parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) | |
download | blackbird-op-linux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.tar.gz blackbird-op-linux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/xdr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 8a4d9c106af1..fde16f40a581 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -993,6 +993,7 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base, return -EINVAL; } else { if (xdr_decode_word(buf, base, &desc->array_len) != 0 || + desc->array_len > desc->array_maxlen || (unsigned long) base + 4 + desc->array_len * desc->elem_size > buf->len) return -EINVAL; |