commit 0e3bcc4648d30dd37a9757bc75ba848b8c3356ad
author David Drysdale <drysdale@google.com> Thu Oct 02 11:03:15 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Oct 23 09:06:12 2014
tree a7e0ec7654310bc6840ab2517daa778ecb29edb6
parent 429e7606cf38b5b381c6b10fbf00b120455786d9

chaps: Protect against bad argument to C_GetFunctionList

BUG=None
TEST=Chaps unit tests (with ASAN) plus PKCS11 tests

Change-Id: I185250fd209e2233159d3edef75aec815e3d64fe
Reviewed-on: https://chromium-review.googlesource.com/221934
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Commit-Queue: David Drysdale <drysdale@google.com>
Tested-by: David Drysdale <drysdale@google.com>

chaps/chaps.cc

diff --git a/chaps/chaps.cc b/chaps/chaps.cc
index 077323d..c94e03c 100644
--- a/chaps/chaps.cc
+++ b/chaps/chaps.cc
@@ -183,6 +183,7 @@
 
 // PKCS #11 v2.20 section 11.4 page 106.
 CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) {
+  LOG_CK_RV_AND_RETURN_IF(!ppFunctionList, CKR_ARGUMENTS_BAD);
   static CK_VERSION version = {2, 20};
   static CK_FUNCTION_LIST functionList = {
     version,