diff options
| author | Shawn Willden <swillden@google.com> | 2016-02-10 13:27:31 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2016-02-10 20:32:29 +0000 |
| commit | 530c51f246e1a532dbf12f1cf3be95bb601a9d26 (patch) | |
| tree | 98d3aa5a5dffaaf4b2f18e4c35651a1659de9852 | |
| parent | 43786c8ca4e9034b5aa1528b52f9eaaa7551b05f (diff) | |
| download | android_system_keymaster-530c51f246e1a532dbf12f1cf3be95bb601a9d26.tar.gz android_system_keymaster-530c51f246e1a532dbf12f1cf3be95bb601a9d26.tar.bz2 android_system_keymaster-530c51f246e1a532dbf12f1cf3be95bb601a9d26.zip | |
Fix null pointer dereference in SofKeymasterDevice.
Bug: 26862905
Change-Id: I05823b07fbbc957b7f4b7eacb9f25c1d869a8045
| -rw-r--r-- | soft_keymaster_device.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp index cbeaec7..5b4e59f 100644 --- a/soft_keymaster_device.cpp +++ b/soft_keymaster_device.cpp @@ -871,7 +871,8 @@ keymaster_error_t SoftKeymasterDevice::import_key( return km1_dev->import_key(km1_dev, params, key_format, key_data, key_blob, characteristics); - *characteristics = nullptr; + if (characteristics) + *characteristics = nullptr; request.key_format = key_format; request.SetKeyMaterial(key_data->data, key_data->data_length); |