Do not encrypt the .rodata section

luoyesiqiu · Aug 8, 2024 · a98fee5 · a98fee5
1 parent 3229a1d
commit a98fee5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/dpt/src/main/java/com/luoye/dpt/builder/Apk.java b/dpt/src/main/java/com/luoye/dpt/builder/Apk.java
@@ -276,7 +276,7 @@ private void encryptSoFiles(String apkDir){
                             readElf.close();
                             for (ReadElf.SectionHeader sectionHeader : sectionHeaders) {
 
-                                if(".bitcode".equals(sectionHeader.getName()) || ".rodata".equals(sectionHeader.getName())) {
+                                if(".bitcode".equals(sectionHeader.getName())) {
 
                                     LogUtils.info("start encrypt %s section: %s,offset: %s,size: %s",
                                             soFile.getAbsolutePath(),

diff --git a/shell/src/main/cpp/bhook/bh_util.c b/shell/src/main/cpp/bhook/bh_util.c
@@ -47,7 +47,7 @@
 
 int bh_util_set_addr_protect(void *addr, int prot) {
   uintptr_t start_addr = PAGE_START((uintptr_t)addr);
-  uintptr_t end_addr = PAGE_START((uintptr_t)addr + sizeof(uintptr_t) - 1) + PAGE_SIZE;
+  uintptr_t end_addr = PAGE_START((uintptr_t)addr + sizeof(uintptr_t) - 1) + getpagesize();
   size_t size = end_addr - start_addr;
 
   if (0 != mprotect((void *)start_addr, size, prot)) return -1;
@@ -56,7 +56,7 @@ int bh_util_set_addr_protect(void *addr, int prot) {
 
 int bh_util_set_protect(void *start, void *end, int prot) {
   uintptr_t start_addr = PAGE_START((uintptr_t)start);
-  uintptr_t end_addr = PAGE_START((uintptr_t)end - 1) + PAGE_SIZE;
+  uintptr_t end_addr = PAGE_START((uintptr_t)end - 1) + getpagesize();
   size_t size = end_addr - start_addr;
 
   if (0 != mprotect((void *)start_addr, size, prot)) return -1;

diff --git a/shell/src/main/cpp/dpt.cpp b/shell/src/main/cpp/dpt.cpp
@@ -243,7 +243,7 @@ DPT_ENCRYPT void createAntiRiskProcess() {
     }
 }
 
-void decrypt_section(const char* section_name,int temp_prot,int target_prot) {
+void decrypt_section(const char* section_name, int temp_prot, int target_prot) {
     Dl_info info;
     dladdr((const void *)decrypt_section,&info);
     Elf_Shdr shdr;
@@ -273,7 +273,6 @@ void decrypt_section(const char* section_name,int temp_prot,int target_prot) {
 }
 
 void decrypt_bitcode() {
-    decrypt_section((char *)DATA_SECTION_RO_DATA,PROT_READ | PROT_WRITE,PROT_READ);
     decrypt_section((char *)DATA_SECTION_BITCODE,PROT_READ | PROT_WRITE | PROT_EXEC,PROT_READ | PROT_EXEC);
 }
 

diff --git a/shell/src/main/cpp/dpt_util.cpp b/shell/src/main/cpp/dpt_util.cpp
@@ -18,12 +18,9 @@ DPT_DATA_SECTION uint8_t DATA_R_FLAG[] = "r";
 
 int dpt_mprotect(void *start,void *end,int prot) {
     uintptr_t start_addr = PAGE_START((uintptr_t)start);
-    uintptr_t end_addr = PAGE_START((uintptr_t)end - 1) + PAGE_SIZE;
+    uintptr_t end_addr = PAGE_START((uintptr_t)end - 1) + getpagesize();
     size_t size = end_addr - start_addr;
 
-    DLOGD("%s begin: %p, size: %zu",__FUNCTION__,(void *)start_addr,size);
-
-
     if (0 != mprotect((void *)start_addr, size, prot)) return -1;
     return 0;
 }