summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorTreehugger Robot2017-11-28 13:54:27 -0600
committerGerrit Code Review2017-11-28 13:54:27 -0600
commitf03f2a5cd7a7ad7a2cfa3c2ae5f512c0ddbeeb80 (patch)
treec6137b1b5e4990641e912687c78129ff77a4c2d5 /trusty
parent8055ea44de477a1e0e5aa7e8fd0d4c835a1c0bf5 (diff)
parent53eb0cb5a3c3c754f623469e8535ea6559fb34bc (diff)
downloadplatform-system-core-f03f2a5cd7a7ad7a2cfa3c2ae5f512c0ddbeeb80.tar.gz
platform-system-core-f03f2a5cd7a7ad7a2cfa3c2ae5f512c0ddbeeb80.tar.xz
platform-system-core-f03f2a5cd7a7ad7a2cfa3c2ae5f512c0ddbeeb80.zip
Merge "add null pointer check for msg buffer"
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/trusty_keymaster_ipc.cpp5
1 files changed, 5 insertions, 0 deletions
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
55 55
56 size_t msg_size = in_size + sizeof(struct keymaster_message); 56 size_t msg_size = in_size + sizeof(struct keymaster_message);
57 struct keymaster_message* msg = reinterpret_cast<struct keymaster_message*>(malloc(msg_size)); 57 struct keymaster_message* msg = reinterpret_cast<struct keymaster_message*>(malloc(msg_size));
58 if (!msg) {
59 ALOGE("failed to allocate msg buffer\n");
60 return -EINVAL;
61 }
62
58 msg->cmd = cmd; 63 msg->cmd = cmd;
59 memcpy(msg->payload, in, in_size); 64 memcpy(msg->payload, in, in_size);
60 65