commit 4cc34c4ed96b206bc6e0bed7138b19c534131b5e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Feb 22 02:38:15 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 22 02:38:15 2025 -0800
tree 5f9f4d2eed1321161db462bd3934da5c79abb4ff
parent b86b339cb4e3b47bf08caa8458aa3c2de457cc26
parent 425c646ffff486d1da817302af8d18e9deed3112

Merge "trusty: utils: rpmb_dev: rpmb_dev.wv.system.rc: update init sequence" into main

fs_mgr/libsnapshot/include/libsnapshot/cow_format.h

diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
index 991e17c..66f9a83 100644
--- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
+++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
@@ -329,6 +329,16 @@
     uint8_t read_ahead_state;
 } __attribute__((packed));
 
+constexpr size_t GetCowOpSize(size_t version) {
+    if (version == 3) {
+        return sizeof(CowOperationV3);
+    } else if (version == 2 || version == 1) {
+        return sizeof(CowOperationV2);
+    } else {
+        return 0;
+    }
+}
+
 // 2MB Scratch space used for read-ahead
 static constexpr uint64_t BUFFER_REGION_DEFAULT_SIZE = (1ULL << 21);
 

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 8bdf5b6..2a27c1d 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -749,7 +749,7 @@
         PLOG(FATAL) << "Failed to unlink " << or_dest;
     }
     const char* args[] = {or_dest.c_str(), nullptr};
-    fexecve(dest.get(), const_cast<char**>(args), nullptr);
+    fexecve(dest.get(), const_cast<char**>(args), environ);
 
     // execv() only returns if an error happened, in which case we
     // panic and never return from this function.