summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xdr.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-29 22:40:27 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-29 22:40:27 +0200
commitc1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch)
tree9333907ca767be24fcb3667877242976c3e3c8dd /net/sunrpc/xdr.c
parentUpdate Chelsio gige net driver. (diff)
parent[PATCH] missing include in smc-ultra (diff)
downloadlinux-c1b054d03f5b31c33eaa0b267c629b118eaf3790.tar.xz
linux-c1b054d03f5b31c33eaa0b267c629b118eaf3790.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/sunrpc/xdr.c')
-rw-r--r--net/sunrpc/xdr.c1
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;