commit 7ec74f9f4042d96c5d55b4b203b8613593d08a93
author Shawn Willden <swillden@google.com> Thu Dec 11 13:57:59 2014 -0700
committer Shawn Willden <swillden@google.com> Thu Jan 22 16:35:35 2015 -0700
tree c0ba343e3caf98c7188b7a5ee3eed4459a5c7fde
parent 941d1c4ad4422a796d90010191c11aef0580295e

Call Abort() on aborted operations.

This change was already reviewed, merged and reverted, so I'm skipping
the review step this time.

Change-Id: I47a11e366fcf8d8f877e7d21fc1c8257cec3d51d

google_keymaster.cpp

diff --git a/google_keymaster.cpp b/google_keymaster.cpp
index fd4b345..582a03b 100644
--- a/google_keymaster.cpp
+++ b/google_keymaster.cpp
@@ -273,7 +273,10 @@
     OpTableEntry* entry = FindOperation(op_handle);
     if (entry == NULL)
         return KM_ERROR_INVALID_OPERATION_HANDLE;
+    keymaster_error_t error = entry->operation->Abort();
     DeleteOperation(entry);
+    if (error != KM_ERROR_OK)
+        return error;
     return KM_ERROR_OK;
 }