From e8167afe55d4e33e93d7270701403708d9a03e7e Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 20 Apr 2016 10:50:15 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptfs.c b/cryptfs.c index be61ae1..10efb90 100644 --- a/cryptfs.c +++ b/cryptfs.c @@ -1452,7 +1452,7 @@ static int decrypt_master_key_aux(const char *passwd, unsigned char *salt, /* 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; } -- 2.11.0