Android/redroid-patches
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android-11.0.0_r48 patches

Browse Source
This commit is contained in:
Ziyang Zhou
2023-10-05 22:29:11 +08:00
parent 03a0fccccd
commit aea90812bf
18 changed files with 829 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android-11.0.0_r48/system/bpf/0001-fix-booting.patch Normal file
View File

@@ -0,0 +1,24 @@
From e8c5556f165a7fa0c37507a7ab84fbbd1103ce38 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Fri, 25 Jun 2021 15:04:35 +0000
Subject: [PATCH] fix booting
---
bpfloader/BpfLoader.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index e67c469..92fa1b6 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -89,7 +89,6 @@ int main() {
ALOGE("If this triggers randomly, you might be hitting some memory allocation problems or "
"startup script race.");
ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
- return 2;
}
if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
--
2.34.1

116
android-11.0.0_r48/system/core/0001-fix-booting.patch Normal file
View File

@@ -0,0 +1,116 @@
From b9b0be77870bd70461f4f3dae8c4026a04d3e2dd Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sun, 9 May 2021 23:27:12 +0800
Subject: [PATCH 1/7] fix booting
---
init/first_stage_init.cpp | 18 +++++++++++++++---
init/service.cpp | 3 ++-
init/util.cpp | 3 ++-
rootdir/init.rc | 1 -
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index 021557697..8a16cd7d0 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -34,6 +34,7 @@
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
+#include <android-base/strings.h>
#include <modprobe/modprobe.h>
#include <private/android_filesystem_config.h>
@@ -192,6 +193,8 @@ int FirstStageMain(int argc, char** argv) {
CHECKCALL(mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755"));
CHECKCALL(mkdir("/dev/pts", 0755));
CHECKCALL(mkdir("/dev/socket", 0755));
+ mount("/system/etc", "/etc", "none", MS_BIND, NULL); // cgroup fix
+ unshare(CLONE_NEWCGROUP);
CHECKCALL(mount("devpts", "/dev/pts", "devpts", 0, NULL));
#define MAKE_STR(x) __STRING(x)
CHECKCALL(mount("proc", "/proc", "proc", 0, "hidepid=2,gid=" MAKE_STR(AID_READPROC)));
@@ -246,7 +249,6 @@ int FirstStageMain(int argc, char** argv) {
for (const auto& [error_string, error_errno] : errors) {
LOG(ERROR) << error_string << " " << strerror(error_errno);
}
- LOG(FATAL) << "Init encountered errors starting first stage, aborting";
}
LOG(INFO) << "init first stage started!";
@@ -319,12 +321,22 @@ int FirstStageMain(int argc, char** argv) {
1);
const char* path = "/system/bin/init";
- const char* args[] = {path, "selinux_setup", nullptr};
+ std::vector<const char *> args = {path, "second_stage"};
+ std::string init_cmdline;
+ android::base::ReadFileToString("/proc/self/cmdline", &init_cmdline);
+ std::replace(init_cmdline.begin(), init_cmdline.end(), '\0', ' ');
+ auto cmd_vector = android::base::Split(android::base::Trim(init_cmdline), " ");
+ int i = 0;
+ for (const auto& entry : cmd_vector) {
+ if (i++ == 0) continue; // ignore first arg '/init'
+ args.push_back(entry.c_str());
+ }
+ args.push_back(nullptr);
auto fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
close(fd);
- execv(path, const_cast<char**>(args));
+ execv(path, const_cast<char**>(args.data()));
// execv() only returns if an error happened, in which case we
// panic and never fall through this conditional.
diff --git a/init/service.cpp b/init/service.cpp
index 69f944eb2..7e61129ad 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -63,6 +63,7 @@ namespace android {
namespace init {
static Result<std::string> ComputeContextFromExecutable(const std::string& service_path) {
+ se_hack1("HACKED");
std::string computed_context;
char* raw_con = nullptr;
@@ -319,7 +320,7 @@ void Service::Reap(const siginfo_t& siginfo) {
if (++crash_count_ > 4) {
if (flags_ & SVC_CRITICAL) {
// Aborts into bootloader
- LOG(FATAL) << "critical process '" << name_ << "' exited 4 times "
+ LOG(ERROR) << "critical process '" << name_ << "' exited 4 times "
<< (boot_completed ? "in 4 minutes" : "before boot completed");
} else {
LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times "
diff --git a/init/util.cpp b/init/util.cpp
index 255434a1b..a9ac09d78 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -236,7 +236,8 @@ int wait_for_file(const char* filename, std::chrono::nanoseconds timeout) {
void ImportKernelCmdline(const std::function<void(const std::string&, const std::string&)>& fn) {
std::string cmdline;
- android::base::ReadFileToString("/proc/cmdline", &cmdline);
+ android::base::ReadFileToString("/proc/self/cmdline", &cmdline);
+ std::replace(cmdline.begin(), cmdline.end(), '\0', ' ');
for (const auto& entry : android::base::Split(android::base::Trim(cmdline), " ")) {
std::vector<std::string> pieces = android::base::Split(entry, "=");
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a9af0b094..183c8cc20 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -457,7 +457,6 @@ on post-fs
# Once everything is setup, no need to modify /.
# The bind+remount combination allows this to work in containers.
- mount rootfs rootfs / remount bind ro nodev
# Make sure /sys/kernel/debug (if present) is labeled properly
# Note that tracefs may be mounted under debug, so we need to cross filesystems
--
2.34.1

25
android-11.0.0_r48/system/core/0002-allow-override-ro.-prop.patch Normal file
View File

@@ -0,0 +1,25 @@
From 30253820d549e09ac21495983370d32dc3429397 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sun, 9 May 2021 23:29:12 +0800
Subject: [PATCH 2/7] allow override ro.* prop
---
init/property_service.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/init/property_service.cpp b/init/property_service.cpp
index a89504e59..0ba7602e3 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1047,6 +1047,8 @@ static void ProcessKernelCmdline() {
for_emulator = true;
} else if (StartsWith(key, "androidboot.")) {
InitPropertySet("ro.boot." + key.substr(12), value);
+ } else if (StartsWith(key, "ro.")) {
+ InitPropertySet(key, value);
}
});
--
2.34.1

26
android-11.0.0_r48/system/core/0003-ignore-input-subsystem.patch Normal file
View File

@@ -0,0 +1,26 @@
From 60326b60976aa1477b8d1d242327e00c8f90ee51 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Fri, 25 Jun 2021 15:56:47 +0000
Subject: [PATCH 3/7] ignore input subsystem
---
rootdir/ueventd.rc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 9c2cdf27f..425a5f412 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -9,9 +9,6 @@ subsystem drm
devname uevent_devpath
dirname /dev/dri
-subsystem input
- devname uevent_devpath
- dirname /dev/input
subsystem sound
devname uevent_devpath
--
2.34.1

24
android-11.0.0_r48/system/core/0004-ignore-devfs-mount.patch Normal file
View File

@@ -0,0 +1,24 @@
From ea66dde5d548554c9a0871f4db4a0f92303909f2 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Fri, 17 Dec 2021 22:44:33 +0800
Subject: [PATCH 4/7] ignore devfs mount
---
init/first_stage_init.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index 8a16cd7d0..2dd3ec587 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -190,7 +190,6 @@ int FirstStageMain(int argc, char** argv) {
CHECKCALL(setenv("PATH", _PATH_DEFPATH, 1));
// Get the basic filesystem setup we need put together in the initramdisk
// on / and then we'll let the rc file figure out the rest.
- CHECKCALL(mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755"));
CHECKCALL(mkdir("/dev/pts", 0755));
CHECKCALL(mkdir("/dev/socket", 0755));
mount("/system/etc", "/etc", "none", MS_BIND, NULL); // cgroup fix
--
2.34.1

24
android-11.0.0_r48/system/core/0005-auto-alloc-binder-devices.patch Normal file
View File

@@ -0,0 +1,24 @@
From d26ba9b0e4a999e5c5c1daa6469e7044f4b96367 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Thu, 6 Jan 2022 20:47:28 +0800
Subject: [PATCH 5/7] auto alloc binder devices
---
rootdir/init.rc | 1 +
1 file changed, 1 insertion(+)
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 183c8cc20..d1cd120db 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -176,6 +176,7 @@ on init
mkdir /dev/binderfs
mount binder binder /dev/binderfs stats=global
chmod 0755 /dev/binderfs
+ exec -- /vendor/bin/binder_alloc /dev/binderfs/binder-control binder hwbinder vndbinder
# Mount fusectl
mount fusectl none /sys/fs/fuse/connections
--
2.34.1

28
android-11.0.0_r48/system/core/0006-mount-cpuacct-and-cpu-together.patch Normal file
View File

@@ -0,0 +1,28 @@
From 17a19be89f85e2d03123f9eb5661b397a78a1a63 Mon Sep 17 00:00:00 2001
From: Tung <john@example.com>
Date: Fri, 19 Aug 2022 10:07:23 +0800
Subject: [PATCH 6/7] mount cpuacct and cpu together
---
libprocessgroup/setup/cgroup_map_write.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libprocessgroup/setup/cgroup_map_write.cpp b/libprocessgroup/setup/cgroup_map_write.cpp
index 25f16a6e9..9ef9c1105 100644
--- a/libprocessgroup/setup/cgroup_map_write.cpp
+++ b/libprocessgroup/setup/cgroup_map_write.cpp
@@ -291,6 +291,11 @@ static bool SetupCgroup(const CgroupDescriptor& descriptor) {
result = mount("none", controller->path(), "cgroup", MS_NODEV | MS_NOEXEC | MS_NOSUID,
controller->name());
}
+ if (result < 0 && (!strcmp(controller->name(), "cpu")
+ || !strcmp(controller->name(), "cpuacct"))) {
+ result = mount("none", controller->path(), "cgroup", MS_NODEV | MS_NOEXEC | MS_NOSUID,
+ "cpu,cpuacct");
+ }
}
if (result < 0) {
--
2.34.1

24
android-11.0.0_r48/system/core/0007-skip-fusectl-mount.patch Normal file
View File

@@ -0,0 +1,24 @@
From d8145b3fb540ea511eb985eb45ba2eb6397043d7 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sat, 2 Sep 2023 17:10:16 +0800
Subject: [PATCH 7/7] skip fusectl mount
---
rootdir/init.rc | 1 -
1 file changed, 1 deletion(-)
diff --git a/rootdir/init.rc b/rootdir/init.rc
index d1cd120db..37548614c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -179,7 +179,6 @@ on init
exec -- /vendor/bin/binder_alloc /dev/binderfs/binder-control binder hwbinder vndbinder
# Mount fusectl
- mount fusectl none /sys/fs/fuse/connections
symlink /dev/binderfs/binder /dev/binder
symlink /dev/binderfs/hwbinder /dev/hwbinder
--
2.34.1

45
android-11.0.0_r48/system/libhwbinder/0001-fix-booting.patch Normal file
View File

@@ -0,0 +1,45 @@
From 770e2da85d3a6d4e2692f18a89f0fe733891f52f Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sun, 9 May 2021 23:44:12 +0800
Subject: [PATCH] fix booting
---
Binder.cpp | 1 +
ProcessState.cpp | 3 +++
2 files changed, 4 insertions(+)
diff --git a/Binder.cpp b/Binder.cpp
index 9edd27b..7badbce 100644
--- a/Binder.cpp
+++ b/Binder.cpp
@@ -90,6 +90,7 @@ bool BHwBinder::isRequestingSid() {
}
void BHwBinder::setRequestingSid(bool requestingSid) {
+ requestingSid = false; // HACKED
Extras* e = mExtras.load(std::memory_order_acquire);
if (!e) {
diff --git a/ProcessState.cpp b/ProcessState.cpp
index 694efd1..811f0de 100644
--- a/ProcessState.cpp
+++ b/ProcessState.cpp
@@ -166,12 +166,15 @@ bool ProcessState::becomeContextManager(context_check_func checkFunc, void* user
mBinderContextCheckFunc = checkFunc;
mBinderContextUserData = userData;
+#if 0 // HACKED (?)
flat_binder_object obj {
.flags = FLAT_BINDER_FLAG_TXN_SECURITY_CTX,
};
status_t result = ioctl(mDriverFD, BINDER_SET_CONTEXT_MGR_EXT, &obj);
+#endif
+ status_t result = 1;
// fallback to original method
if (result != 0) {
android_errorWriteLog(0x534e4554, "121035042");
--
2.34.1

24
android-11.0.0_r48/system/libvintf/0001-ignore-compatibility-check.patch Normal file
View File

@@ -0,0 +1,24 @@
From 6783a207d24cf9af937ea458b6f85e2777694be2 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sat, 15 Oct 2022 09:12:31 +0800
Subject: [PATCH] ignore compatibility check
---
VintfObject.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/VintfObject.cpp b/VintfObject.cpp
index 13e2f5c..cd39281 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -591,7 +591,6 @@ int32_t VintfObject::checkCompatibility(std::string* error, CheckFlags::Type fla
error->insert(0,
"Runtime info and framework compatibility matrix are incompatible: ");
}
- return INCOMPATIBLE;
}
}
--
2.34.1

46
android-11.0.0_r48/system/netd/0001-fix-networking.patch Normal file
View File

@@ -0,0 +1,46 @@
From c3ddb62620fc63af06e57377f6c49fdd6e74ce18 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Mon, 26 Apr 2021 23:09:01 +0800
Subject: [PATCH] ? fix networking
---
server/IptablesRestoreController.cpp | 1 +
server/TrafficController.cpp | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp
index 10cedfa3..e2550b55 100644
--- a/server/IptablesRestoreController.cpp
+++ b/server/IptablesRestoreController.cpp
@@ -362,6 +362,7 @@ int IptablesRestoreController::execute(const IptablesTarget target, const std::s
if (target == V6 || target == V4V6) {
res |= sendCommand(IP6TABLES_PROCESS, command, output);
}
+ res = 0; // ignore iptables error
return res;
}
diff --git a/server/TrafficController.cpp b/server/TrafficController.cpp
index 3839962f..f3485745 100644
--- a/server/TrafficController.cpp
+++ b/server/TrafficController.cpp
@@ -777,7 +777,7 @@ Status TrafficController::swapActiveStatsMap() {
if (!oldConfiguration.ok()) {
ALOGE("Cannot read the old configuration from map: %s",
oldConfiguration.error().message().c_str());
- return Status(oldConfiguration.error().code(), oldConfiguration.error().message());
+ return netdutils::status::ok; // HACKED
}
// Write to the configuration map to inform the kernel eBPF program to switch
@@ -802,7 +802,6 @@ Status TrafficController::swapActiveStatsMap() {
int ret = synchronizeKernelRCU();
if (ret) {
ALOGE("map swap synchronize_rcu() ended with failure: %s", strerror(-ret));
- return statusFromErrno(-ret, "map swap synchronize_rcu() failed");
}
return netdutils::status::ok;
}
--
2.34.1

26
android-11.0.0_r48/system/vold/0001-fix-remote-android-redroid-doc-42-ignore-project-quo.patch Normal file
View File

@@ -0,0 +1,26 @@
From 945ad97a303cef1760cfd61a42768a513b5f17e8 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sat, 6 Aug 2022 10:19:11 +0800
Subject: [PATCH] fix remote-android/redroid-doc#42 ignore project quota error
Change-Id: I97dc074c6e0119eeb1b2463839ee9cda5c7fa8b4
---
Utils.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Utils.cpp b/Utils.cpp
index 17921e8e..817f63c4 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -240,7 +240,7 @@ int SetQuotaProjectId(const std::string& path, long projectId) {
}
fsx.fsx_projid = projectId;
- return ioctl(fd, FS_IOC_FSSETXATTR, &fsx);
+ return (ioctl(fd, FS_IOC_FSSETXATTR, &fsx), 0);
}
int PrepareDirWithProjectId(const std::string& path, mode_t mode, uid_t uid, gid_t gid,
--
2.34.1