Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
7c73cacd
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
接近 2 年 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7c73cacd
编写于
6月 18, 2014
作者:
R
Rich Felker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reduce code duplication in dynamic linker error paths
eventually this should help making dlerror thread-safe too.
上级
adf94c19
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
16 deletion
+16
-16
src/ldso/dynlink.c
src/ldso/dynlink.c
+16
-16
未找到文件。
src/ldso/dynlink.c
浏览文件 @
7c73cacd
#define _GNU_SOURCE
#define _GNU_SOURCE
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <string.h>
#include <unistd.h>
#include <unistd.h>
#include <stdint.h>
#include <stdint.h>
...
@@ -149,6 +150,17 @@ static int search_vec(size_t *v, size_t *r, size_t key)
...
@@ -149,6 +150,17 @@ static int search_vec(size_t *v, size_t *r, size_t key)
return
1
;
return
1
;
}
}
static
void
error
(
const
char
*
fmt
,
...)
{
va_list
ap
;
va_start
(
ap
,
fmt
);
vsnprintf
(
errbuf
,
sizeof
errbuf
,
fmt
,
ap
);
va_end
(
ap
);
if
(
runtime
)
longjmp
(
*
rtld_fail
,
1
);
dprintf
(
2
,
"%s
\n
"
,
errbuf
);
ldso_fail
=
1
;
}
static
uint32_t
sysv_hash
(
const
char
*
s0
)
static
uint32_t
sysv_hash
(
const
char
*
s0
)
{
{
const
unsigned
char
*
s
=
(
void
*
)
s0
;
const
unsigned
char
*
s
=
(
void
*
)
s0
;
...
@@ -267,12 +279,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
...
@@ -267,12 +279,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
if
(
!
astype
)
continue
;
if
(
!
astype
)
continue
;
type
=
remap_rel
(
astype
);
type
=
remap_rel
(
astype
);
if
(
!
type
)
{
if
(
!
type
)
{
snprintf
(
errbuf
,
sizeof
errbuf
,
error
(
errbuf
,
sizeof
errbuf
,
"Error relocating %s: unsupported relocation type %d"
,
"Error relocating %s: unsupported relocation type %d"
,
dso
->
name
,
astype
);
dso
->
name
,
astype
);
if
(
runtime
)
longjmp
(
*
rtld_fail
,
1
);
dprintf
(
2
,
"%s
\n
"
,
errbuf
);
ldso_fail
=
1
;
continue
;
continue
;
}
}
sym_index
=
R_SYM
(
rel
[
1
]);
sym_index
=
R_SYM
(
rel
[
1
]);
...
@@ -284,12 +293,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
...
@@ -284,12 +293,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
def
=
find_sym
(
ctx
,
name
,
type
==
REL_PLT
);
def
=
find_sym
(
ctx
,
name
,
type
==
REL_PLT
);
if
(
!
def
.
sym
&&
(
sym
->
st_shndx
!=
SHN_UNDEF
if
(
!
def
.
sym
&&
(
sym
->
st_shndx
!=
SHN_UNDEF
||
sym
->
st_info
>>
4
!=
STB_WEAK
))
{
||
sym
->
st_info
>>
4
!=
STB_WEAK
))
{
snprintf
(
errbuf
,
sizeof
errbuf
,
error
(
errbuf
,
sizeof
errbuf
,
"Error relocating %s: %s: symbol not found"
,
"Error relocating %s: %s: symbol not found"
,
dso
->
name
,
name
);
dso
->
name
,
name
);
if
(
runtime
)
longjmp
(
*
rtld_fail
,
1
);
dprintf
(
2
,
"%s
\n
"
,
errbuf
);
ldso_fail
=
1
;
continue
;
continue
;
}
}
}
else
{
}
else
{
...
@@ -798,12 +804,9 @@ static void load_deps(struct dso *p)
...
@@ -798,12 +804,9 @@ static void load_deps(struct dso *p)
if
(
p
->
dynv
[
i
]
!=
DT_NEEDED
)
continue
;
if
(
p
->
dynv
[
i
]
!=
DT_NEEDED
)
continue
;
dep
=
load_library
(
p
->
strings
+
p
->
dynv
[
i
+
1
],
p
);
dep
=
load_library
(
p
->
strings
+
p
->
dynv
[
i
+
1
],
p
);
if
(
!
dep
)
{
if
(
!
dep
)
{
snprintf
(
errbuf
,
sizeof
errbuf
,
error
(
errbuf
,
sizeof
errbuf
,
"Error loading shared library %s: %m (needed by %s)"
,
"Error loading shared library %s: %m (needed by %s)"
,
p
->
strings
+
p
->
dynv
[
i
+
1
],
p
->
name
);
p
->
strings
+
p
->
dynv
[
i
+
1
],
p
->
name
);
if
(
runtime
)
longjmp
(
*
rtld_fail
,
1
);
dprintf
(
2
,
"%s
\n
"
,
errbuf
);
ldso_fail
=
1
;
continue
;
continue
;
}
}
if
(
runtime
)
{
if
(
runtime
)
{
...
@@ -852,12 +855,9 @@ static void reloc_all(struct dso *p)
...
@@ -852,12 +855,9 @@ static void reloc_all(struct dso *p)
if
(
p
->
relro_start
!=
p
->
relro_end
&&
if
(
p
->
relro_start
!=
p
->
relro_end
&&
mprotect
(
p
->
base
+
p
->
relro_start
,
p
->
relro_end
-
p
->
relro_start
,
PROT_READ
)
<
0
)
{
mprotect
(
p
->
base
+
p
->
relro_start
,
p
->
relro_end
-
p
->
relro_start
,
PROT_READ
)
<
0
)
{
snprintf
(
errbuf
,
sizeof
errbuf
,
error
(
errbuf
,
sizeof
errbuf
,
"Error relocating %s: RELRO protection failed: %m"
,
"Error relocating %s: RELRO protection failed: %m"
,
p
->
name
);
p
->
name
);
if
(
runtime
)
longjmp
(
*
rtld_fail
,
1
);
dprintf
(
2
,
"%s
\n
"
,
errbuf
);
ldso_fail
=
1
;
}
}
p
->
relocated
=
1
;
p
->
relocated
=
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录