diff options
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc-git/rtld_no.patch')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-git/rtld_no.patch | 216 |
1 files changed, 0 insertions, 216 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch b/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch deleted file mode 100644 index 36fec651fe..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch +++ /dev/null | |||
@@ -1,216 +0,0 @@ | |||
1 | Patch is backported from | ||
2 | http://lists.busybox.net/pipermail/uclibc/2011-March/045004.html | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Index: git/ldso/include/dl-elf.h | ||
7 | =================================================================== | ||
8 | --- git.orig/ldso/include/dl-elf.h 2011-07-01 15:20:51.000000000 -0700 | ||
9 | +++ git/ldso/include/dl-elf.h 2011-07-01 15:30:43.274364603 -0700 | ||
10 | @@ -26,16 +26,18 @@ | ||
11 | static __inline__ void _dl_unmap_cache(void) { } | ||
12 | #endif | ||
13 | |||
14 | +#define DL_RESOLVE_SECURE 0x0001 | ||
15 | +#define DL_RESOLVE_NOLOAD 0x0002 | ||
16 | |||
17 | /* Function prototypes for non-static stuff in readelflib1.c */ | ||
18 | extern void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt, | ||
19 | unsigned long rel_addr, unsigned long rel_size); | ||
20 | extern int _dl_parse_relocation_information(struct dyn_elf *rpnt, | ||
21 | struct r_scope_elem *scope, unsigned long rel_addr, unsigned long rel_size); | ||
22 | -extern struct elf_resolve * _dl_load_shared_library(int secure, | ||
23 | +extern struct elf_resolve * _dl_load_shared_library(int resolve_flags, | ||
24 | struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname, | ||
25 | int trace_loaded_objects); | ||
26 | -extern struct elf_resolve * _dl_load_elf_shared_library(int secure, | ||
27 | +extern struct elf_resolve * _dl_load_elf_shared_library(int resolve_flags, | ||
28 | struct dyn_elf **rpnt, const char *libname); | ||
29 | extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname, | ||
30 | int trace_loaded_objects); | ||
31 | Index: git/ldso/ldso/dl-elf.c | ||
32 | =================================================================== | ||
33 | --- git.orig/ldso/ldso/dl-elf.c 2011-07-01 15:21:47.000000000 -0700 | ||
34 | +++ git/ldso/ldso/dl-elf.c 2011-07-01 15:31:29.814432859 -0700 | ||
35 | @@ -132,7 +132,7 @@ | ||
36 | /* This function's behavior must exactly match that | ||
37 | * in uClibc/ldso/util/ldd.c */ | ||
38 | static struct elf_resolve * | ||
39 | -search_for_named_library(const char *name, int secure, const char *path_list, | ||
40 | +search_for_named_library(const char *name, int resolve_flags, const char *path_list, | ||
41 | struct dyn_elf **rpnt, const char *origin) | ||
42 | { | ||
43 | char *mylibname; | ||
44 | @@ -162,7 +162,7 @@ | ||
45 | |||
46 | if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) { | ||
47 | int olen; | ||
48 | - if (secure && plen != 7) | ||
49 | + if ((resolve_flags & DL_RESOLVE_SECURE) && plen != 7) | ||
50 | continue; | ||
51 | if (origin == NULL) | ||
52 | continue; | ||
53 | @@ -182,7 +182,7 @@ | ||
54 | _dl_strcat(mylibname, "/"); | ||
55 | _dl_strcat(mylibname, name); | ||
56 | |||
57 | - tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname); | ||
58 | + tpnt = _dl_load_elf_shared_library(resolve_flags, rpnt, mylibname); | ||
59 | if (tpnt != NULL) | ||
60 | return tpnt; | ||
61 | } | ||
62 | @@ -194,7 +194,7 @@ | ||
63 | unsigned long _dl_error_number; | ||
64 | unsigned long _dl_internal_error_number; | ||
65 | |||
66 | -struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, | ||
67 | +struct elf_resolve *_dl_load_shared_library(int resolve_flags, struct dyn_elf **rpnt, | ||
68 | struct elf_resolve *tpnt, char *full_libname, int attribute_unused trace_loaded_objects) | ||
69 | { | ||
70 | char *pnt; | ||
71 | @@ -223,7 +223,7 @@ | ||
72 | |||
73 | if (libname != full_libname) { | ||
74 | _dl_if_debug_dprint("\ttrying file='%s'\n", full_libname); | ||
75 | - tpnt1 = _dl_load_elf_shared_library(secure, rpnt, full_libname); | ||
76 | + tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, full_libname); | ||
77 | if (tpnt1) { | ||
78 | return tpnt1; | ||
79 | } | ||
80 | @@ -238,7 +238,7 @@ | ||
81 | if (pnt) { | ||
82 | pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; | ||
83 | _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt); | ||
84 | - if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, | ||
85 | + if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt, | ||
86 | tpnt->libname)) != NULL) | ||
87 | return tpnt1; | ||
88 | } | ||
89 | @@ -247,7 +247,7 @@ | ||
90 | /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */ | ||
91 | if (_dl_library_path) { | ||
92 | _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path); | ||
93 | - if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL) | ||
94 | + if ((tpnt1 = search_for_named_library(libname, resolve_flags, _dl_library_path, rpnt, NULL)) != NULL) | ||
95 | { | ||
96 | return tpnt1; | ||
97 | } | ||
98 | @@ -261,7 +261,7 @@ | ||
99 | if (pnt) { | ||
100 | pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; | ||
101 | _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt); | ||
102 | - if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL) | ||
103 | + if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt, NULL)) != NULL) | ||
104 | return tpnt1; | ||
105 | } | ||
106 | #endif | ||
107 | @@ -284,7 +284,7 @@ | ||
108 | || libent[i].flags == LIB_ELF_LIBC0 | ||
109 | || libent[i].flags == LIB_ELF_LIBC5) | ||
110 | && _dl_strcmp(libname, strs + libent[i].sooffset) == 0 | ||
111 | - && (tpnt1 = _dl_load_elf_shared_library(secure, rpnt, strs + libent[i].liboffset)) | ||
112 | + && (tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, strs + libent[i].liboffset)) | ||
113 | ) { | ||
114 | return tpnt1; | ||
115 | } | ||
116 | @@ -295,14 +295,14 @@ | ||
117 | /* Look for libraries wherever the shared library loader | ||
118 | * was installed */ | ||
119 | _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath); | ||
120 | - tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL); | ||
121 | + tpnt1 = search_for_named_library(libname, resolve_flags, _dl_ldsopath, rpnt, NULL); | ||
122 | if (tpnt1 != NULL) | ||
123 | return tpnt1; | ||
124 | |||
125 | /* Lastly, search the standard list of paths for the library. | ||
126 | This list must exactly match the list in uClibc/ldso/util/ldd.c */ | ||
127 | _dl_if_debug_dprint("\tsearching full lib path list\n"); | ||
128 | - tpnt1 = search_for_named_library(libname, secure, | ||
129 | + tpnt1 = search_for_named_library(libname, resolve_flags, | ||
130 | UCLIBC_RUNTIME_PREFIX "lib:" | ||
131 | UCLIBC_RUNTIME_PREFIX "usr/lib" | ||
132 | #ifndef __LDSO_CACHE_SUPPORT__ | ||
133 | @@ -444,7 +444,7 @@ | ||
134 | * are required. | ||
135 | */ | ||
136 | |||
137 | -struct elf_resolve *_dl_load_elf_shared_library(int secure, | ||
138 | +struct elf_resolve *_dl_load_elf_shared_library(int resolve_flags, | ||
139 | struct dyn_elf **rpnt, const char *libname) | ||
140 | { | ||
141 | ElfW(Ehdr) *epnt; | ||
142 | @@ -483,7 +483,7 @@ | ||
143 | } | ||
144 | /* If we are in secure mode (i.e. a setu/gid binary using LD_PRELOAD), | ||
145 | we don't load the library if it isn't setuid. */ | ||
146 | - if (secure) { | ||
147 | + if (resolve_flags & DL_RESOLVE_SECURE) { | ||
148 | if (!(st.st_mode & S_ISUID)) { | ||
149 | _dl_close(infile); | ||
150 | return NULL; | ||
151 | @@ -499,6 +499,10 @@ | ||
152 | return tpnt; | ||
153 | } | ||
154 | } | ||
155 | + if (resolve_flags & DL_RESOLVE_NOLOAD) { | ||
156 | + _dl_close(infile); | ||
157 | + return NULL; | ||
158 | + } | ||
159 | header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE, | ||
160 | MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0); | ||
161 | if (_dl_mmap_check_error(header)) { | ||
162 | Index: git/ldso/ldso/ldso.c | ||
163 | =================================================================== | ||
164 | --- git.orig/ldso/ldso/ldso.c 2011-07-01 15:24:32.000000000 -0700 | ||
165 | +++ git/ldso/ldso/ldso.c 2011-07-01 15:24:55.143854007 -0700 | ||
166 | @@ -854,7 +854,9 @@ | ||
167 | if (!_dl_secure || _dl_strchr(str, '/') == NULL) { | ||
168 | _dl_if_debug_dprint("\tfile='%s'; needed by '%s'\n", str, _dl_progname); | ||
169 | |||
170 | - tpnt1 = _dl_load_shared_library(_dl_secure, &rpnt, NULL, str, trace_loaded_objects); | ||
171 | + tpnt1 = _dl_load_shared_library( | ||
172 | + _dl_secure ? DL_RESOLVE_SECURE : 0, | ||
173 | + &rpnt, NULL, str, trace_loaded_objects); | ||
174 | if (!tpnt1) { | ||
175 | #ifdef __LDSO_LDD_SUPPORT__ | ||
176 | if (trace_loaded_objects || _dl_trace_prelink) | ||
177 | Index: git/ldso/libdl/libdl.c | ||
178 | =================================================================== | ||
179 | --- git.orig/ldso/libdl/libdl.c 2011-07-01 15:20:51.000000000 -0700 | ||
180 | +++ git/ldso/libdl/libdl.c 2011-07-01 15:24:55.143854007 -0700 | ||
181 | @@ -305,7 +305,7 @@ | ||
182 | #endif | ||
183 | |||
184 | /* A bit of sanity checking... */ | ||
185 | - if (!(flag & (RTLD_LAZY|RTLD_NOW))) { | ||
186 | + if (!(flag & (RTLD_LAZY|RTLD_NOW|RTLD_NOLOAD))) { | ||
187 | _dl_error_number = LD_BAD_HANDLE; | ||
188 | return NULL; | ||
189 | } | ||
190 | @@ -375,8 +375,9 @@ | ||
191 | /* Try to load the specified library */ | ||
192 | _dl_if_debug_print("Trying to dlopen '%s', RTLD_GLOBAL:%d RTLD_NOW:%d\n", | ||
193 | (char*)libname, (flag & RTLD_GLOBAL ? 1:0), (now_flag & RTLD_NOW ? 1:0)); | ||
194 | - tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname, 0); | ||
195 | |||
196 | + tpnt = _dl_load_shared_library((flag & RTLD_NOLOAD) ? DL_RESOLVE_NOLOAD : 0, | ||
197 | + &rpnt, tfrom, (char*)libname, 0); | ||
198 | if (tpnt == NULL) { | ||
199 | _dl_unmap_cache(); | ||
200 | return NULL; | ||
201 | Index: git/libc/sysdeps/linux/common/bits/dlfcn.h | ||
202 | =================================================================== | ||
203 | --- git.orig/libc/sysdeps/linux/common/bits/dlfcn.h 2011-07-01 15:20:52.000000000 -0700 | ||
204 | +++ git/libc/sysdeps/linux/common/bits/dlfcn.h 2011-07-01 15:24:55.143854007 -0700 | ||
205 | @@ -24,9 +24,9 @@ | ||
206 | /* The MODE argument to `dlopen' contains one of the following: */ | ||
207 | #define RTLD_LAZY 0x00001 /* Lazy function call binding. */ | ||
208 | #define RTLD_NOW 0x00002 /* Immediate function call binding. */ | ||
209 | -#if 0 /* uClibc doesnt support these */ | ||
210 | -#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */ | ||
211 | +#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */ | ||
212 | #define RTLD_NOLOAD 0x00004 /* Do not load the object. */ | ||
213 | +#if 0 /* uClibc doesnt support these */ | ||
214 | #define RTLD_DEEPBIND 0x00008 /* Use deep binding. */ | ||
215 | #endif | ||
216 | |||