diff options
| author | Yan, Shaopu <shaopu.yan@intel.com> | 2017-11-28 19:58:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-28 19:58:40 +0000 |
| commit | a3e487671550d84a21755457bf2f3e39db4e00df (patch) | |
| tree | ff47fa363ccbc2d88dc7a05bed7ddba06bf27fb3 /trusty | |
| parent | 0bdb39ef5d86e888d44c624d91d28c860d03b430 (diff) | |
| parent | f03f2a5cd7a7ad7a2cfa3c2ae5f512c0ddbeeb80 (diff) | |
| download | system_core-a3e487671550d84a21755457bf2f3e39db4e00df.tar.gz system_core-a3e487671550d84a21755457bf2f3e39db4e00df.tar.bz2 system_core-a3e487671550d84a21755457bf2f3e39db4e00df.zip | |
Merge "add null pointer check for msg buffer"
am: f03f2a5cd7
Change-Id: I988bd6cf38aae918dd6b8c547b6db92501925685
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_ipc.cpp | 5 |
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 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); |