Skip to content

T
Third Party Musl

OpenHarmony / Third Party Musl
9 个月 前同步成功

通知 37
Star 125
Fork 0
T
Third Party Musl

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 6442ca0a 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!385 修改asan环境动态库加载失败 

Merge pull request !385 from 王家辉/branch_rm003_0711
上级 36e9a542 e8ece904
隐藏空白更改
内联 并排
Showing with 18 addition and 18 deletion
porting/linux/user/config/ld-musl-namespace-aarch64-test.ini
浏览文件 @ 6442ca0a
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
test = /data/tests/libc-test/src/functionalext:/data/tests/libc-test/src/functionalext/dlns test = /data/tests/libc-test/src/functionalext:/data/tests/libc-test/src/functionalext/dlns
[acquiescence] [acquiescence]
namespace.default.lib.paths = /system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib namespace.default.lib.paths = /system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/data/lib:/data/lib64
namespace.default.asan.lib.paths = /system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib namespace.default.asan.lib.paths = /system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/data/lib:/data/lib64
[test] [test]
added.nslist=ns_no_allowed_libs,ns_normal,ns_wrong_lib_path,ns_wrong_allowed_path,for_inherit_A,for_inherit_AA,inherited_class,ns_separated_flase,ns_asan_lib_path,ns_asan_permit_path added.nslist=ns_no_allowed_libs,ns_normal,ns_wrong_lib_path,ns_wrong_allowed_path,for_inherit_A,for_inherit_AA,inherited_class,ns_separated_flase,ns_asan_lib_path,ns_asan_permit_path
......
porting/linux/user/config/ld-musl-namespace-aarch64.ini
浏览文件 @ 6442ca0a
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
acquiescence = / acquiescence = /
[acquiescence] [acquiescence]
namespace.default.lib.paths = /system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib namespace.default.lib.paths = /system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/data/lib:/data/lib64
namespace.default.asan.lib.paths = /system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib namespace.default.asan.lib.paths = /system/lib64:/system/lib64/module:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib:/data/lib:/data/lib64
porting/linux/user/config/ld-musl-namespace-arm-test.ini
浏览文件 @ 6442ca0a
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
test = /data/tests/libc-test/src/functionalext:/data/tests/libc-test/src/functionalext/dlns test = /data/tests/libc-test/src/functionalext:/data/tests/libc-test/src/functionalext/dlns
[acquiescence] [acquiescence]
namespace.default.lib.paths = /system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib namespace.default.lib.paths = /system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib:/data/lib
namespace.default.asan.lib.paths = /system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib namespace.default.asan.lib.paths = /system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib:/data/lib
[test] [test]
added.nslist=ns_no_allowed_libs,ns_normal,ns_wrong_lib_path,ns_wrong_allowed_path,for_inherit_A,for_inherit_AA,inherited_class,ns_separated_flase,ns_asan_lib_path,ns_asan_permit_path added.nslist=ns_no_allowed_libs,ns_normal,ns_wrong_lib_path,ns_wrong_allowed_path,for_inherit_A,for_inherit_AA,inherited_class,ns_separated_flase,ns_asan_lib_path,ns_asan_permit_path
......
porting/linux/user/config/ld-musl-namespace-arm.ini
浏览文件 @ 6442ca0a
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
acquiescence = / acquiescence = /
[acquiescence] [acquiescence]
namespace.default.lib.paths = /system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib namespace.default.lib.paths = /system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib:/data/lib
namespace.default.asan.lib.paths = /system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib namespace.default.asan.lib.paths = /system/lib:/system/lib/module:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib:/data/lib
porting/linux/user/ldso/dynlink.c
浏览文件 @ 6442ca0a
...@@ -206,7 +206,7 @@ static void load_preload(char *s, ns_t *ns, struct loadtasks *tasks); ...@@ -206,7 +206,7 @@ static void load_preload(char *s, ns_t *ns, struct loadtasks *tasks);
static void handle_relro_sharing(struct dso *p, const dl_extinfo *extinfo, ssize_t *relro_fd_offset); static void handle_relro_sharing(struct dso *p, const dl_extinfo *extinfo, ssize_t *relro_fd_offset);
/* asan path open */ /* asan path open */
int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf); int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf, size_t buf_size);
/* add namespace function */ /* add namespace function */
static void *addr2dso(size_t a); static void *addr2dso(size_t a);
...@@ -333,7 +333,7 @@ static void init_namespace(struct dso *app) ...@@ -333,7 +333,7 @@ static void init_namespace(struct dso *app)
nslist *nsl = nslist_init(); nslist *nsl = nslist_init();
ns_configor *conf = configor_init(); ns_configor *conf = configor_init();
char file_path[sizeof "/etc/ld-musl-namespace-" + sizeof (LDSO_ARCH) + sizeof ".ini" + 1]; char file_path[sizeof "/etc/ld-musl-namespace-" + sizeof (LDSO_ARCH) + sizeof ".ini" + 1] = {0};
(void)snprintf(file_path, sizeof file_path, "/etc/ld-musl-namespace-%s.ini", LDSO_ARCH); (void)snprintf(file_path, sizeof file_path, "/etc/ld-musl-namespace-%s.ini", LDSO_ARCH);
LD_LOGI("init_namespace file_path:%s", file_path); LD_LOGI("init_namespace file_path:%s", file_path);
int ret = conf->parse(file_path, app_path); int ret = conf->parse(file_path, app_path);
...@@ -1262,7 +1262,8 @@ static struct dso *find_library_by_name(const char *name, const ns_t *ns, bool c ...@@ -1262,7 +1262,8 @@ static struct dso *find_library_by_name(const char *name, const ns_t *ns, bool c
} }
/* Find loaded so by file stat */ /* Find loaded so by file stat */
static struct dso *find_library_by_fstat(const struct stat *st, const ns_t *ns, bool check_inherited) { static struct dso *find_library_by_fstat(const struct stat *st, const ns_t *ns, bool check_inherited) {
LD_LOGD("find_library_by_fstat st->st_dev:%lu, st->st_ino:%lu, ns:%p, check_inherited:%d\n", st->st_dev, st->st_ino, ns, check_inherited); LD_LOGD("find_library_by_fstat st->st_dev:%lu, st->st_ino:%lu, ns:%p, check_inherited:%d\n",
st->st_dev, st->st_ino, ns, check_inherited);
struct dso *p = search_dso_by_fstat(st, ns); struct dso *p = search_dso_by_fstat(st, ns);
if (p) return p; if (p) return p;
if (check_inherited && ns->ns_inherits) { if (check_inherited && ns->ns_inherits) {
...@@ -1373,7 +1374,7 @@ struct dso *load_library( ...@@ -1373,7 +1374,7 @@ struct dso *load_library(
} }
if (g_is_asan) { if (g_is_asan) {
fd = handle_asan_path_open(fd, name, namespace, buf); fd = handle_asan_path_open(fd, name, namespace, buf, sizeof buf);
LD_LOGD("load_library handle_asan_path_open fd:%d.\n", fd); LD_LOGD("load_library handle_asan_path_open fd:%d.\n", fd);
} else { } else {
if (fd == -1 && namespace->lib_paths) { if (fd == -1 && namespace->lib_paths) {
...@@ -2538,7 +2539,6 @@ static void *dlopen_impl( ...@@ -2538,7 +2539,6 @@ static void *dlopen_impl(
do_dlclose(p); do_dlclose(p);
p = 0; p = 0;
} }
LD_LOGD("dlopen %s: realpath=%s, handle=%p", name, p->rpath, handle);
#endif #endif
end: end:
#ifdef LOAD_ORDER_RANDOMIZATION #ifdef LOAD_ORDER_RANDOMIZATION
...@@ -3085,7 +3085,7 @@ int dlns_set_namespace_allowed_libs(const char * name, const char * allowed_libs ...@@ -3085,7 +3085,7 @@ int dlns_set_namespace_allowed_libs(const char * name, const char * allowed_libs
return 0; return 0;
} }
int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf) int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf, size_t buf_size)
{ {
LD_LOGD("handle_asan_path_open fd:%d, name:%s , namespace:%p , buf:%s.\n", fd, name, namespace, buf); LD_LOGD("handle_asan_path_open fd:%d, name:%s , namespace:%p , buf:%s.\n", fd, name, namespace, buf);
int fd_tmp = fd; int fd_tmp = fd;
...@@ -3097,14 +3097,14 @@ int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf) ...@@ -3097,14 +3097,14 @@ int handle_asan_path_open(int fd, const char *name, ns_t *namespace, char *buf)
strcpy(new_lib_paths, namespace->asan_lib_paths); strcpy(new_lib_paths, namespace->asan_lib_paths);
strcat(new_lib_paths, ":"); strcat(new_lib_paths, ":");
strcat(new_lib_paths, namespace->lib_paths); strcat(new_lib_paths, namespace->lib_paths);
fd_tmp = path_open(name, new_lib_paths, buf, sizeof buf); fd_tmp = path_open(name, new_lib_paths, buf, buf_size);
LD_LOGD("handle_asan_path_open path_open new_lib_paths:%s ,fd: %d.\n", new_lib_paths, fd_tmp); LD_LOGD("handle_asan_path_open path_open new_lib_paths:%s ,fd: %d.\n", new_lib_paths, fd_tmp);
free(new_lib_paths); free(new_lib_paths);
} else if (namespace->asan_lib_paths) { } else if (namespace->asan_lib_paths) {
fd_tmp = path_open(name, namespace->asan_lib_paths, buf, sizeof buf); fd_tmp = path_open(name, namespace->asan_lib_paths, buf, buf_size);
LD_LOGD("handle_asan_path_open path_open asan_lib_paths:%s ,fd: %d.\n", namespace->asan_lib_paths, fd_tmp); LD_LOGD("handle_asan_path_open path_open asan_lib_paths:%s ,fd: %d.\n", namespace->asan_lib_paths, fd_tmp);
} else { } else {
fd_tmp = path_open(name, namespace->lib_paths, buf, sizeof buf); fd_tmp = path_open(name, namespace->lib_paths, buf, buf_size);
LD_LOGD("handle_asan_path_open path_open lib_paths:%s ,fd: %d.\n", namespace->lib_paths, fd_tmp); LD_LOGD("handle_asan_path_open path_open lib_paths:%s ,fd: %d.\n", namespace->lib_paths, fd_tmp);
} }
} }
...@@ -3509,7 +3509,7 @@ static bool load_library_header(struct loadtask *task) ...@@ -3509,7 +3509,7 @@ static bool load_library_header(struct loadtask *task)
} }
} }
if (g_is_asan) { if (g_is_asan) {
task->fd = handle_asan_path_open(task->fd, name, namespace, task->buf); task->fd = handle_asan_path_open(task->fd, name, namespace, task->buf, sizeof task->buf);
LD_LOGD("load_library handle_asan_path_open fd:%d.\n", task->fd); LD_LOGD("load_library handle_asan_path_open fd:%d.\n", task->fd);
} else { } else {
if (task->fd == -1 && namespace->lib_paths) { if (task->fd == -1 && namespace->lib_paths) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或