commit e8167afe55d4e33e93d7270701403708d9a03e7e
author Greg Kaiser <gkaiser@google.com> Wed Apr 20 10:50:15 2016 -0700
committer Greg Kaiser <gkaiser@google.com> Wed Apr 20 10:50:15 2016 -0700
tree 670ece10d68e6068738e91163f124f15e937cacc
parent 9247987e84c17aa2886b13b51db36f2a2b07d4e1

cryptfs: Avoid dereferencing null pointer

We already know that "intermediate_key" is non-NULL here.  We
care if the result of the allocation, "*intermediate_key", is
non-NULL prior to our memcpy.

Change-Id: I83e22dfadabb870d527b93b31470bf47e22201bb

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index be61ae1..10efb90 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1452,7 +1452,7 @@
   /* Copy intermediate key if needed by params */
   if (intermediate_key && intermediate_key_size) {
     *intermediate_key = (unsigned char*) malloc(KEY_LEN_BYTES);
-    if (intermediate_key) {
+    if (*intermediate_key) {
       memcpy(*intermediate_key, ikey, KEY_LEN_BYTES);
       *intermediate_key_size = KEY_LEN_BYTES;
     }