From 53eb0cb5a3c3c754f623469e8535ea6559fb34bc Mon Sep 17 00:00:00 2001
From: "Yan, Shaopu" <shaopu.yan@intel.com>
Date: Tue, 28 Nov 2017 13:08:14 +0800
Subject: [PATCH] add null pointer check for msg buffer

Test: Build
Change-Id: I94e08ccc8372449f11f6e673b6449c50d7eef4f9
---
 trusty/keymaster/trusty_keymaster_ipc.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/trusty/keymaster/trusty_keymaster_ipc.cpp b/trusty/keymaster/trusty_keymaster_ipc.cpp
index fbd0eb396..686e7aec6 100644
--- a/trusty/keymaster/trusty_keymaster_ipc.cpp
+++ b/trusty/keymaster/trusty_keymaster_ipc.cpp
@@ -55,6 +55,11 @@ int trusty_keymaster_call(uint32_t cmd, void* in, uint32_t in_size, uint8_t* out
 
     size_t msg_size = in_size + sizeof(struct keymaster_message);
     struct keymaster_message* msg = reinterpret_cast<struct keymaster_message*>(malloc(msg_size));
+    if (!msg) {
+        ALOGE("failed to allocate msg buffer\n");
+        return -EINVAL;
+    }
+
     msg->cmd = cmd;
     memcpy(msg->payload, in, in_size);