From f82edc1b64398865c462c408f751c79dc592ada8 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 25 Jul 2012 14:32:37 +0000
Subject: [PATCH] 	- review fix for libnss, check hash prefix allocation
 size.

git-svn-id: file:///svn/unbound/trunk@2723 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog           | 3 +++
 validator/val_secalgo.c | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 4fba2c7d3..698d3bb9b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 July 2012: Wouter
+	- review fix for libnss, check hash prefix allocation size.
+
 23 July 2012: Wouter
 	- fix missing break for GOST DS hash function.
 	- implemented forward_first for the root.
diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index 80e3a8914..f3f861ee2 100644
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -973,6 +973,7 @@ verify_canonrrset(ldns_buffer* buf, int algo, unsigned char* sigblock,
 	/* uses libNSS */
 	/* large enough for the different hashes */
 	unsigned char hash[HASH_LENGTH_MAX];
+	unsigned char hash2[HASH_LENGTH_MAX*2];
 	HASH_HashType htype = 0;
 	SECKEYPublicKey* pubkey = NULL;
 	SECItem secsig = {siBuffer, sigblock, sigblock_len};
@@ -1029,7 +1030,12 @@ verify_canonrrset(ldns_buffer* buf, int algo, unsigned char* sigblock,
 	}
 	if(prefix) {
 		int hashlen = sechash.len;
-		sechash.data = PORT_ArenaAlloc(pubkey->arena, prefixlen+hashlen);
+		if(prefixlen+hashlen > sizeof(hash2)) {
+			verbose(VERB_QUERY, "verify: hashprefix too large");
+			SECKEY_DestroyPublicKey(pubkey);
+			return sec_status_unchecked;
+		}
+		sechash.data = hash2;
 		sechash.len = prefixlen+hashlen;
 		memcpy(sechash.data, prefix, prefixlen);
 		memmove(sechash.data+prefixlen, hash, hashlen);