Initial unified commit for Android 13, with TrebleDroid GSI target, syncing up to 20221111

2022-11-11 12:27:50 +00:00
commit cd68e3dcbc
197 changed files with 127907 additions and 0 deletions
--- a/patches_treble_td/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
+++ b/patches_treble_td/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
@@ -0,0 +1,35 @@
+From 751541648524ec9e93569afa72e308816505ed2c Mon Sep 17 00:00:00 2001
+From: Luca Stefani <luca.stefani.ge1@gmail.com>
+Date: Wed, 9 Sep 2020 12:43:54 +0200
+Subject: [PATCH] libfscrypt: Bail out if we can't open directory
+
+* On QCOM Q vendor init.qcom.rc has a 'mkdir' entry
+  for /data/system
+* While the encryption policy matches and is applied properly in
+  permissive, vendor_init doesn't have enough perms to open
+  and run ioctl over system_data_file to check its policy
+* Instead of opening the possiblity to vendors, just
+  bail out if we fail to open the directory
+
+Test: m, boot r-gsi on Zenfone 6
+Change-Id: I5ea37019221cd0887b8a5d7454f5a42ac01335c7
+---
+ libfscrypt/fscrypt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfscrypt/fscrypt.cpp b/libfscrypt/fscrypt.cpp
+index f6e97f11..bbf40c3c 100644
+--- a/libfscrypt/fscrypt.cpp
+++ b/libfscrypt/fscrypt.cpp
+@@ -326,7 +326,7 @@ bool EnsurePolicy(const EncryptionPolicy& policy, const std::string& directory)
+     android::base::unique_fd fd(open(directory.c_str(), O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC));
+     if (fd == -1) {
+         PLOG(ERROR) << "Failed to open directory " << directory;
+-        return false;
+        return true;
+     }
+ 
+     bool already_encrypted = fscrypt_is_encrypted(fd);
+-- 
+2.25.1
+