Fix android 10+ support

Author: vasishath

lib/inject.c

@@ -326,7 +326,7 @@ static int inject_rd(const char *path)
 int inject_cmdline(struct bootimg *image)
 {
     int res = 0;
-    char* custom_cmdline = "printk.devkmsg=on androidboot.android_dt_dir=/fakefstab/";
+    char* custom_cmdline = "printk.devkmsg=on androidboot.android_dt_dir=/fakefsbat/";
 
     char* cmdline = libbootimg_get_cmdline(&image->hdr);
     char* newcmdline = NULL;

multirom.c

@@ -100,22 +100,22 @@ void disable_dtb_fstab(char* partition) {
     if (access("status", F_OK)) {
         DIR* dir = opendir("/proc/device-tree/firmware/android");
         char** exclude_dirs = NULL;
-        copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefstab", exclude_dirs);
+        copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefsbat", exclude_dirs);
         FILE* fp = fopen("status", "w");
         fprintf(fp, "disabled");
         fclose(fp);
     }
     char path[256];
-    sprintf(path, "/fakefstab/fstab/%s/status", partition);
+    sprintf(path, "/fakefsbat/fstab/%s/status", partition);
     copy_file("/status", path);
 }
 
 void remove_dtb_fstab() {
     mkdir("/dummy_fw", S_IFDIR);
     DIR* dir = opendir("/proc/device-tree/firmware/android");
     char** exclude_dirs = NULL;
-    copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefstab", exclude_dirs);
-    if (!mount("/dummy_fw", "/fakefstab", "ext4", MS_BIND, "discard,nomblk_io_submit")) {
+    copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefsbat", exclude_dirs);
+    if (!mount("/dummy_fw", "/fakefsbat", "ext4", MS_BIND, "discard,nomblk_io_submit")) {
         INFO("dummy dtb node bind mounted in procfs\n");
     } else {
         ERROR("dummy dtb node bind mount failed! %s\n", strerror(errno));
@@ -124,22 +124,32 @@ void remove_dtb_fstab() {
 
 int multirom_is_android10() {
     if (!multirom_path_exists("/", "apex")) {
+        INFO("APEX folder found\n");
+        return 1;
+    }
+    if (!multirom_path_exists("/system", "system/bin/init")) {
+        INFO("system/bin/init found\n");
         return 1;
     }
     char* initPath = "/main_init";
     if (!multirom_path_exists("/", "/.backup/init")) {
         initPath = "/.backup/init";
     }
 
-    char *addr;
+    void *addr;
     int initfd = open(initPath, O_RDWR);
+    INFO("open file %s result %d\n", initPath, initfd);
     struct stat st;
     lstat(initPath, &st);
     size_t size = st.st_size;
-    addr = mmap(NULL, size, PROT_WRITE, MAP_SHARED, initfd, 0);
-    int contains = strstr(addr, "selinux_setup") != NULL;
+    addr = mmap(NULL, size, PROT_READ, MAP_SHARED, initfd, 0);
+    if (addr == -1) {
+       INFO("mmap error! %s\n", strerror(errno));
+    }
+    int contains = memmem(addr, size, "selinux_setup", 13) != NULL;
     munmap(addr, size);
     close(initfd);
+    INFO("init contains selinux_setup %d\n", contains);
     return contains;
 }
 
@@ -1972,6 +1982,7 @@ int multirom_prep_android_mounts(struct multirom_status *s, struct multirom_rom
     asprintf(&system_path, "%s/system.sparse.img", rom->base_path);
 
    if (!multirom_path_exists("/system", "init.rc") && !multirom_is_android10()) {
+       INFO("ROM is not android 10\n");
        umount("/system");
        mkdir_with_perms("/system_root", 0755, NULL, NULL);
        multirom_mount_image(system_path, "/system_root", "ext4", MS_RDONLY, NULL);
@@ -1988,6 +1999,7 @@ int multirom_prep_android_mounts(struct multirom_status *s, struct multirom_rom
        char* exclude_dirs[] = {"system", "vendor", "product", NULL};
        copy_init_contents(dir, "/system_root", "/", true, exclude_dirs);
    } else if (multirom_is_android10()) {
+       INFO("ROM is android 10+\n");
        umount("/system");
        mkdir_with_perms("/system_root", 0755, NULL, NULL);
        multirom_mount_image(system_path, "/system_root", "ext4", MS_RDONLY, NULL);

no_kexec.c

@@ -293,7 +293,7 @@ int nokexec_set_cmdline(char *secondary_path)
 {
     int res = 0;
     struct bootimg image;
-    char* custom_cmdline = "androidboot.selinux=permissive printk.devkmsg=on androidboot.android_dt_dir=/fakefstab/";
+    char* custom_cmdline = "androidboot.selinux=permissive printk.devkmsg=on androidboot.android_dt_dir=/fakefsbat/";
 
     INFO(NO_KEXEC_LOG_TEXT ": Going to check the bootimg in primary slot for slevel\n");
 

trampoline/trampoline.cpp

@@ -736,9 +736,9 @@ int main(int argc, char *argv[])
     umount("/sys/kernel/debug");
 #endif
 
-    if (access("/fakefstab/", F_OK)) {
+    if (access("/fakefsbat/", F_OK)) {
         DIR* dir = opendir("/proc/device-tree/firmware/android");
-        copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefstab", NULL);
+        copy_dir_contents(dir, "/proc/device-tree/firmware/android", "/fakefsbat", NULL);
         //remove("/fakefstab/fstab/system/mnt_point");
         closedir(dir);
         //remove("/fakefstab/fstab/vendor/mnt_point");