commit f20aeb46c3b54abe54864a1744181ea211d44efd
author Rob Barnes <robbarnes@google.com> Fri Sep 28 19:38:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 28 19:38:05 2018 +0000
tree 3bbdeeb39368c8802a1e289e5f6e5ab36ac5b9aa
parent 91fc4caa022c5c81bc58caf61692fd8907c40bbd
parent b9c293b302374527885ad0e0365b1b9935e1f3e9

Merge "Use unique temporary filename for keystore blob."

keystore/blob.cpp

diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index d21c691..4fd7687 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -231,11 +231,10 @@
 
     size_t fileLength = offsetof(blobv3, value) + dataLength + mBlob.info;
 
-    const char* tmpFileName = ".tmp";
-    int out =
-        TEMP_FAILURE_RETRY(open(tmpFileName, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR));
+    char tmpFileName[] = ".tmpXXXXXX";
+    int out = TEMP_FAILURE_RETRY(mkstemp(tmpFileName));
     if (out < 0) {
-        ALOGW("could not open file: %s: %s", tmpFileName, strerror(errno));
+        ALOGW("could not open temporary file: %s: %s", tmpFileName, strerror(errno));
         return ResponseCode::SYSTEM_ERROR;
     }