commit 95f4b9ccb7c31d7c76e42e57e37a4a4b3fea592a
author Oleg Matcovschi <omatcovschi@google.com> Fri Aug 20 00:43:31 2021 -0700
committer Oleg Matcovschi <omatcovschi@google.com> Fri Aug 20 17:16:35 2021 +0000
tree 146c2fd0118e4fc4052ebfb26c0189c5410735fe
parent a07c71c4c78a46fefdbe8dc10076fc81c303de91

bootctrl: enforce synchronous write operation

Bug: 197104397
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: Ifbc612fc40847395ccb751463b1bb15bd3f20657

interfaces/boot/1.2/BootControl.cpp

diff --git a/interfaces/boot/1.2/BootControl.cpp b/interfaces/boot/1.2/BootControl.cpp
index 70b9594..a28be05 100644
--- a/interfaces/boot/1.2/BootControl.cpp
+++ b/interfaces/boot/1.2/BootControl.cpp
@@ -162,7 +162,7 @@
         return false;
     }
 
-    android::base::unique_fd fd(open(DEVINFO_PATH, O_WRONLY));
+    android::base::unique_fd fd(open(DEVINFO_PATH, O_WRONLY | O_DSYNC));
     return android::base::WriteFully(fd, &devinfo, sizeof devinfo);
 }
 
@@ -270,13 +270,13 @@
 
     std::string boot_lun_path =
             std::string("/sys/devices/platform/") + boot_dev + "/pixel/boot_lun_enabled";
-    int fd = open(boot_lun_path.c_str(), O_RDWR);
+    int fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
     if (fd < 0) {
         // Try old path for kernels < 5.4
         // TODO: remove once kernel 4.19 support is deprecated
         std::string boot_lun_path =
                 std::string("/sys/devices/platform/") + boot_dev + "/attributes/boot_lun_enabled";
-        fd = open(boot_lun_path.c_str(), O_RDWR);
+        fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
         if (fd < 0) {
             _hidl_cb({false, "failed to open ufs attr boot_lun_enabled"});
             return Void();