Skip to content

Commit 10153fe

Browse files
caikeluncaikelun
committedMay 21, 2021
1. Add flags to xdl_open() to control whether to force dlopen dynamic library.
2. Add parameter to xdl_sym() and xdl_dsym() to get the size of the symbol. 3. Update version for AGP and CMake.
·
v2.2.0v1.1.0
1 parent 8a57799 commit 10153fe

15 files changed

+160
-145
lines changed
 

‎README.md

+23-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
44
![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
5-
![](https://img.shields.io/badge/release-1.0.4-red.svg?style=flat)
5+
![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
66
![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
77
![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
88

@@ -33,10 +33,10 @@ If xDL is compiled into an independent dynamic library:
3333

3434
| ABI | Compressed (KB) | Uncompressed (KB) |
3535
| :---------- | --------------: | ----------------: |
36-
| armeabi-v7a | 6.6 | 13.9 |
37-
| arm64-v8a | 7.4 | 18.3 |
38-
| x86 | 7.5 | 17.9 |
39-
| x86_64 | 7.8 | 18.6 |
36+
| armeabi-v7a | 6.8 | 13.9 |
37+
| arm64-v8a | 7.5 | 18.3 |
38+
| x86 | 7.7 | 17.9 |
39+
| x86_64 | 7.9 | 18.6 |
4040

4141

4242
## Usage
@@ -61,7 +61,7 @@ android {
6161
}
6262
6363
dependencies {
64-
implementation 'io.hexhacking:xdl:1.0.4'
64+
implementation 'io.hexhacking:xdl:1.1.0'
6565
}
6666
```
6767

@@ -134,15 +134,23 @@ There is a sample app in the [xdl-sample](xdl_sample) folder you can refer to.
134134
### 1. `xdl_open()` and `xdl_close()`
135135

136136
```C
137-
void *xdl_open(const char *filename);
137+
#define XDL_DEFAULT 0x00
138+
#define XDL_TRY_FORCE_LOAD 0x01
139+
#define XDL_ALWAYS_FORCE_LOAD 0x02
140+
141+
void *xdl_open(const char *filename, int flags);
138142
void *xdl_close(void *handle);
139143
```
140144
141-
They are very similar to `dlopen()` and `dlclose()`. But there are the following differences:
145+
They are very similar to `dlopen()` and `dlclose()`. But `xdl_open()` can bypass the restrictions of Android 7.0+ linker namespace.
146+
147+
Depending on the value of the `flags` parameter, the behavior of `xdl_open()` will have some differences:
142148
143-
* `xdl_open()` can bypass the restrictions of Android 7.0+ linker namespace.
144-
* If the library has been loaded into memory, `xdl_open()` will not `dlopen()` it again. (Because most of the system basic libraries will never be `dlclose()` after `dlopen()`)
145-
* If `xdl_open()` really uses `dlopen()` to load the library, `xdl_close()` will return the handle from linker (the return value of `dlopen()`), and then you can decide whether and when to close it with `dlclose()`.
149+
* `XDL_DEFAULT`: If the library has been loaded into memory, `xdl_open()` will not `dlopen()` it again. (But it will still return a valid `handle`)
150+
* `XDL_TRY_FORCE_LOAD`: If the library has not been loaded into memory, `xdl_open()` will try to `dlopen()` it.
151+
* `XDL_ALWAYS_FORCE_LOAD`: `xdl_open()` will always `dlopen()` the library.
152+
153+
If `xdl_open()` really uses `dlopen()` to load the library, `xdl_close()` will return the handle from linker (the return value of `dlopen()`), and then you can decide whether and when to close it with standard `dlclose()`. Otherwise, `NULL` will be returned.
146154
147155
`filename` can be basename or full pathname. However, Android linker has used the namespace mechanism since 7.0. If you pass basename, you need to make sure that no duplicate ELF is loaded into the current process. `xdl_open()` will only return the first matching ELF. Please consider this fragment of `/proc/self/maps` on Android 10:
148156
@@ -164,12 +172,14 @@ They are very similar to `dlopen()` and `dlclose()`. But there are the following
164172
### 2. `xdl_sym()` and `xdl_dsym()`
165173
166174
```C
167-
void *xdl_sym(void *handle, const char *symbol);
168-
void *xdl_dsym(void *handle, const char *symbol);
175+
void *xdl_sym(void *handle, const char *symbol, size_t *symbol_size);
176+
void *xdl_dsym(void *handle, const char *symbol, size_t *symbol_size);
169177
```
170178

171179
They are very similar to `dlsym()`. They all takes a "handle" of an ELF returned by `xdl_open()` and the null-terminated symbol name, returning the address where that symbol is loaded into memory.
172180

181+
If the `symbol_size` parameter is not `NULL`, it will be assigned as "the bytes occupied by the content corresponding to the symbol in the ELF". If you don't need this information, just pass `NULL`.
182+
173183
`xdl_sym()` lookup "dynamic link symbols" in `.dynsym` as `dlsym()` does.
174184

175185
`xdl_dsym()` lookup "debuging symbols" in `.symtab` and "`.symtab` in `.gnu_debugdata`".

‎README.zh-CN.md

+23-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
44
![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
5-
![](https://img.shields.io/badge/release-1.0.4-red.svg?style=flat)
5+
![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
66
![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
77
![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
88

@@ -33,10 +33,10 @@ xDL 是 Android DL 系列函数的增强实现。
3333

3434
| ABI | 压缩后 (KB) | 未压缩 (KB) |
3535
| :---------- | ---------: | ---------: |
36-
| armeabi-v7a | 6.6 | 13.9 |
37-
| arm64-v8a | 7.4 | 18.3 |
38-
| x86 | 7.5 | 17.9 |
39-
| x86_64 | 7.8 | 18.6 |
36+
| armeabi-v7a | 6.8 | 13.9 |
37+
| arm64-v8a | 7.5 | 18.3 |
38+
| x86 | 7.7 | 17.9 |
39+
| x86_64 | 7.9 | 18.6 |
4040

4141

4242
## 使用
@@ -61,7 +61,7 @@ android {
6161
}
6262
6363
dependencies {
64-
implementation 'io.hexhacking:xdl:1.0.4'
64+
implementation 'io.hexhacking:xdl:1.1.0'
6565
}
6666
```
6767

@@ -134,15 +134,23 @@ android {
134134
### 1. `xdl_open()` 和 `xdl_close()`
135135

136136
```C
137-
void *xdl_open(const char *filename);
137+
#define XDL_DEFAULT 0x00
138+
#define XDL_TRY_FORCE_LOAD 0x01
139+
#define XDL_ALWAYS_FORCE_LOAD 0x02
140+
141+
void *xdl_open(const char *filename, int flags);
138142
void *xdl_close(void *handle);
139143
```
140144
141-
它们和 `dlopen()` / `dlclose()` 很相似。但存在以下不同：
145+
它们和 `dlopen()` / `dlclose()` 很相似。但是 `xdl_open()` 可以绕过 Android 7.0+ linker namespace 的限制。
146+
147+
根据 `flags` 参数值的不同，`xdl_open()` 的行为会有一些差异：
142148
143-
* `xdl_open()` 可以绕过 Android 7.0+ linker namespace 的限制。
144-
* 如果动态库已经被加载到内存中了，`xdl_open()` 不会再使用 `dlopen()` 打开它。（因为绝大多数的系统基础库在被 `dlopen()` 后不会再被 `dlclose()`）
145-
* 如果 `xdl_open()` 真的使用 `dlopen()` 加载了动态库，`xdl_close()` 将返回从 linker 那里取得的 handle（`dlopen()` 的返回值），然后你可以决定是否以及什么时候用 `dlclose()` 来关闭它。
149+
* `XDL_DEFAULT`: 如果动态库已经被加载到内存中了，`xdl_open()` 不会再使用 `dlopen()` 加载它。（但依然会返回一个有效的 `handle`）
150+
* `XDL_TRY_FORCE_LOAD`: 如果动态库还没有被加载到内存中，`xdl_open()` 将尝试使用 `dlopen()` 加载它。
151+
* `XDL_ALWAYS_FORCE_LOAD`: `xdl_open()` 将总是使用 `dlopen()` 加载动态库。
152+
153+
如果 `xdl_open()` 真的使用 `dlopen()` 加载了动态库，`xdl_close()` 将返回从 linker 那里取得的 handle（`dlopen()` 的返回值），然后你可以决定是否以及什么时候使用标准的 `dlclose()` 来关闭它。否则，将返回 `NULL`。
146154
147155
`filename` 可是是文件名（basename）也可以是完整的路径名（full pathname）。然而，Android linker 从 7.0 开始启用了 namespace 机制。如果你传递文件名，你需要确认当前进程中没有重名的 ELF 文件。`xdl_open()` 只会返回第一个匹配到的 ELF文件。请考虑以下 Android 10 中的 `/proc/self/maps` 片段：
148156
@@ -164,12 +172,14 @@ void *xdl_close(void *handle);
164172
### 2. `xdl_sym()` 和 `xdl_dsym()`
165173
166174
```C
167-
void *xdl_sym(void *handle, const char *symbol);
168-
void *xdl_dsym(void *handle, const char *symbol);
175+
void *xdl_sym(void *handle, const char *symbol, size_t *symbol_size);
176+
void *xdl_dsym(void *handle, const char *symbol, size_t *symbol_size);
169177
```
170178

171179
它们和 `dlsym()` 很相似。 它们都需要传递一个 `xdl_open()` 返回的 “handle”，和一个 null 结尾的符号名字，返回该符号在内存中的加载地址。
172180

181+
如果 `symbol_size` 参数不为 `NULL`，它将被赋值为“符号对应的内容在 ELF 中占用的字节数”，如果你不需要这个信息，传递 `NULL` 就可以了。
182+
173183
`xdl_sym()` 从 `.dynsym` 中查询 “动态链接符号”，就像 `dlsym()` 做的那样。
174184

175185
`xdl_dsym()` 从 `.symtab` 和 “`.gnu_debugdata` 里的 `.symtab`” 中查询 “调试符号”。

‎build.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
4+
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:4.1.2'
7+
classpath 'com.android.tools.build:gradle:4.2.1'
88
}
99
}
1010

@@ -13,7 +13,6 @@ allprojects {
1313
// mavenLocal()
1414
google()
1515
mavenCentral()
16-
jcenter()
1716
}
1817
}
1918

@@ -26,15 +25,15 @@ ext {
2625
compileSdkVersion = 30
2726
targetSdkVersion = 30
2827
buildToolsVersion = "30.0.3"
29-
javaVersion = JavaVersion.VERSION_1_6
28+
javaVersion = JavaVersion.VERSION_1_7
3029
ndkVersion = "21.4.7075529"
31-
cmakeVersion = "3.10.2"
30+
cmakeVersion = "3.18.1"
3231
abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
3332
useASAN = false
3433

3534
POM_GROUP_ID = "io.hexhacking"
3635
POM_ARTIFACT_ID = "xdl"
37-
POM_VERSION_NAME = "1.0.4"
36+
POM_VERSION_NAME = "1.1.0"
3837

3938
POM_NAME = "xDL Android Lib"
4039
POM_DESCRIPTION = "xDL is an enhanced implementation of the Android DL series functions."

‎gradle/sanitizer.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ project.afterEvaluate {
1818
}
1919

2020
// create ASAN wrap.sh
21-
def resDir = new File("src/main/resources/lib/" + abi)
21+
def projectDir = project.projectDir.toString()
22+
def resDir = new File(projectDir + "/src/main/resources/lib/" + abi)
2223
resDir.mkdirs()
2324
def wrapFile = new File(resDir, "wrap.sh")
2425
wrapFile.withWriter { writer ->
@@ -36,7 +37,7 @@ project.afterEvaluate {
3637
println "sanitizer: [${abi}] create wrap.sh: " + wrapFile.absolutePath
3738

3839
// copy ASAN libs
39-
def libDir = new File("src/main/jniLibs/" + abi)
40+
def libDir = new File(projectDir + "/src/main/jniLibs/" + abi)
4041
libDir.mkdirs()
4142
FileTree tree = fileTree(dir: ndkLibDir).include("**/libclang_rt.asan-${arch}-android.so")
4243
tree.each { File file ->

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎xdl/src/main/cpp/CMakeLists.txt

+12-42
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,17 @@
1-
cmake_minimum_required(VERSION 3.10.2)
1+
cmake_minimum_required(VERSION 3.18.1)
2+
project(xdl)
23

3-
add_compile_options(
4-
-std=c11
5-
-Weverything
6-
-Werror)
7-
8-
file(GLOB XDL_SRC
9-
*.c)
10-
11-
add_library(xdl SHARED
12-
${XDL_SRC})
13-
14-
target_include_directories(xdl PUBLIC
15-
include
16-
.)
17-
18-
#target_link_libraries(xdl
19-
# log)
4+
file(GLOB XDL_SRC *.c)
5+
add_library(xdl SHARED ${XDL_SRC})
6+
target_compile_features(xdl PUBLIC c_std_11)
7+
target_compile_options(xdl PUBLIC -Weverything -Werror)
8+
target_include_directories(xdl PUBLIC include .)
9+
#target_link_libraries(xdl log)
2010

2111
if(USEASAN)
22-
23-
target_compile_options(xdl PUBLIC
24-
-fsanitize=address
25-
-fno-omit-frame-pointer)
26-
27-
set_target_properties(xdl PROPERTIES
28-
LINK_FLAGS " \
29-
-fsanitize=address")
30-
12+
target_compile_options(xdl PUBLIC -fsanitize=address -fno-omit-frame-pointer)
13+
target_link_options(xdl PUBLIC -fsanitize=address)
3114
else()
32-
33-
target_compile_options(xdl PUBLIC
34-
-Oz
35-
-flto
36-
-ffunction-sections
37-
-fdata-sections)
38-
39-
set_target_properties(xdl PROPERTIES
40-
LINK_FLAGS " \
41-
-O3 \
42-
-flto \
43-
-Wl,--exclude-libs,ALL \
44-
-Wl,--gc-sections \
45-
-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/xdl.map.txt")
46-
15+
target_compile_options(xdl PUBLIC -Oz -flto -ffunction-sections -fdata-sections)
16+
target_link_options(xdl PUBLIC -O3 -flto -Wl,--exclude-libs,ALL -Wl,--gc-sections -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/xdl.map.txt)
4717
endif()

‎xdl/src/main/cpp/include/xdl.h

+16-11
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
// Created by caikelun on 2020-10-04.
2323

2424
//
25-
// xDL version: 1.0.4
25+
// xDL version: 1.1.0
2626
//
27-
// You can always get the latest version from:
27+
// xDL is an enhanced implementation of the Android DL series functions.
28+
// For more information, documentation, and the latest version please check:
2829
// https://github.com/hexhacking/xDL
2930
//
3031

@@ -40,27 +41,31 @@ extern "C" {
4041
#endif
4142

4243
//
43-
// Enhanced dlopen() / dlclose() / dlsym()
44+
// Default value for flags in both xdl_open() and xdl_iterate_phdr().
4445
//
45-
void *xdl_open(const char *filename);
46-
void *xdl_close(void *handle);
46+
#define XDL_DEFAULT 0x00
4747

48-
void *xdl_sym(void *handle, const char *symbol);
49-
void *xdl_dsym(void *handle, const char *symbol);
48+
//
49+
// Enhanced dlopen() / dlclose() / dlsym().
50+
//
51+
#define XDL_TRY_FORCE_LOAD 0x01
52+
#define XDL_ALWAYS_FORCE_LOAD 0x02
53+
void *xdl_open(const char *filename, int flags);
54+
void *xdl_close(void *handle);
55+
void *xdl_sym(void *handle, const char *symbol, size_t *symbol_size);
56+
void *xdl_dsym(void *handle, const char *symbol, size_t *symbol_size);
5057

5158
//
52-
// Enhanced dladdr()
59+
// Enhanced dladdr().
5360
//
5461
int xdl_addr(void *addr, Dl_info *info, void **cache);
5562
void xdl_addr_clean(void **cache);
5663

5764
//
58-
// Enhanced dl_iterate_phdr()
65+
// Enhanced dl_iterate_phdr().
5966
//
60-
#define XDL_DEFAULT 0x00
6167
#define XDL_WITH_LINKER 0x01
6268
#define XDL_FULL_PATHNAME 0x02
63-
6469
int xdl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *), void *data, int flags);
6570

6671
#ifdef __cplusplus

0 commit comments

Comments
 (0)
Please sign in to comment.