commit 4c96a1673e27e0f672314a12c153a4b5689a3dae
author David Anderson <dvander@google.com> Wed Feb 01 19:54:44 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 01 19:54:44 2023 +0000
tree 0fcde36163d6a34d0d5aa02ec816bde8ccf29ccb
parent b52704a608f2dbc746f736a61ed7b7fa82fb053e
parent 45eee7fe521901f4a2e271d34212267bc3974f84

Merge "OTA: make lp_metadata write more atomic"

fs_mgr/libfiemap/metadata.cpp

diff --git a/fs_mgr/libfiemap/metadata.cpp b/fs_mgr/libfiemap/metadata.cpp
index b0dfb5c..22b8afb 100644
--- a/fs_mgr/libfiemap/metadata.cpp
+++ b/fs_mgr/libfiemap/metadata.cpp
@@ -30,6 +30,7 @@
 namespace fiemap {
 
 using namespace android::fs_mgr;
+using android::base::unique_fd;
 
 static constexpr uint32_t kMaxMetadataSize = 256 * 1024;
 
@@ -109,10 +110,18 @@
     if (exported->partitions.empty() && android::base::RemoveFileIfExists(metadata_file)) {
         return true;
     }
-    if (!WriteToImageFile(metadata_file, *exported.get())) {
+
+    unique_fd fd(open(metadata_file.c_str(), O_CREAT | O_RDWR | O_TRUNC | O_CLOEXEC | O_BINARY | O_SYNC, 0644));
+    if (fd < 0) {
+        LOG(ERROR) << "open failed: " << metadata_file;
+        return false;
+    }
+
+    if (!WriteToImageFile(fd, *exported.get())) {
         LOG(ERROR) << "Unable to save new metadata";
         return false;
     }
+
     return true;
 }