1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
|
From a8dcffb30680d6db5704f9ce2fc30621ceb454e7 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri, 10 Nov 2023 10:43:12 -0300
Subject: [PATCH] elf: Handle non-directory name in search path (BZ 31035)
The open_path stops if a relative path in search path contains a
component that is a non directory (for instance, if the component
is an existing file).
For instance:
$ cat > lib.c <<EOF
> void foo (void) {}
> EOF
$ gcc -shared -fPIC -o lib.so lib.c
$ cat > main.c <<EOF
extern void foo ();
int main () { foo (); return 0; }
EOF
$ gcc -o main main.c lib.so
$ LD_LIBRARY_PATH=. ./main
$ LD_LIBRARY_PATH=non-existing/path:. ./main
$ LD_LIBRARY_PATH=$(pwd)/main:. ./main
$ LD_LIBRARY_PATH=./main:. ./main
./main: error while loading shared libraries: lib.so: cannot open shared object file: No such file or directory
The invalid './main' should be ignored as a non-existent one,
instead as a valid but non accessible file.
Absolute paths do not trigger this issue because their status are
initialized as 'unknown' and open_path check if this is a directory.
Checked on x86_64-linux-gnu.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
---
elf/Makefile | 12 ++++++
elf/dl-load.c | 9 ++--
elf/tst-non-directory-mod.c | 1 +
elf/tst-non-directory-path.c | 7 ++++
elf/tst-non-directory-path.sh | 77 +++++++++++++++++++++++++++++++++++
5 files changed, 103 insertions(+), 3 deletions(-)
create mode 100644 elf/tst-non-directory-mod.c
create mode 100644 elf/tst-non-directory-path.c
create mode 100755 elf/tst-non-directory-path.sh
diff --git a/elf/Makefile b/elf/Makefile
index 6403dd28..ed13f34d 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -400,6 +400,7 @@ tests += \
tst-nodelete-dlclose \
tst-nodelete-opened \
tst-noload \
+ tst-non-directory-path \
tst-null-argv \
tst-relsort1 \
tst-ro-dynamic \
@@ -682,6 +683,7 @@ modules-names = \
tst-ldconfig-soname-lib-without-soname \
tst-main1mod \
tst-nodelete2mod \
+ tst-non-directory-mod \
tst-nodelete-dlclose-dso \
tst-nodelete-dlclose-plugin \
tst-nodelete-opened-lib \
@@ -936,6 +938,7 @@ ifeq (yes,$(build-shared))
ifeq ($(run-built-tests),yes)
tests-special += \
$(objpfx)argv0test.out \
+ $(objpfx)tst-non-directory-path.out \
$(objpfx)tst-pathopt.out \
$(objpfx)tst-rtld-help.out \
$(objpfx)tst-rtld-load-self.out \
@@ -2486,3 +2489,12 @@ $(objpfx)tst-ro-dynamic-mod.so: $(objpfx)tst-ro-dynamic-mod.os \
$(objpfx)tst-dlmopen-twice.out: \
$(objpfx)tst-dlmopen-twice-mod1.so \
$(objpfx)tst-dlmopen-twice-mod2.so
+
+LDFLAGS-tst-non-directory-mod.so = -Wl,-soname,tst-non-directory-mod.so
+$(objpfx)tst-non-directory-path: $(objpfx)tst-non-directory-mod.so
+$(objpfx)tst-non-directory-path.out: tst-non-directory-path.sh \
+ $(objpfx)tst-non-directory-path
+ $(SHELL) tst-non-directory-path.sh $(objpfx)ld.so $(objpfx)tst-non-directory-path \
+ '$(test-wrapper-env)' '$(run_program_env)' \
+ '$(rpath-link)' $(objpfx) > $@; \
+ $(evaluate-test)
diff --git a/elf/dl-load.c b/elf/dl-load.c
index beb4f995..0c883cb0 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1946,7 +1946,6 @@ open_path (const char *name, size_t namelen, int mode,
size_t cnt;
char *edp;
int here_any = 0;
- int err;
/* If we are debugging the search for libraries print the path
now if it hasn't happened now. */
@@ -2047,8 +2046,12 @@ open_path (const char *name, size_t namelen, int mode,
return -1;
}
}
- if (here_any && (err = errno) != ENOENT && err != EACCES)
- /* The file exists and is readable, but something went wrong. */
+
+ /* Continue the search if the file does not exist (ENOENT), if it can
+ not be accessed (EACCES), or if the a component in the path is not a
+ directory (for instance, if the component is a existing file meaning
+ essentially that the pathname is invalid - ENOTDIR). */
+ if (here_any && errno != ENOENT && errno != EACCES && errno != ENOTDIR)
return -1;
/* Remember whether we found anything. */
diff --git a/elf/tst-non-directory-mod.c b/elf/tst-non-directory-mod.c
new file mode 100644
index 00000000..aa6d4c27
--- /dev/null
+++ b/elf/tst-non-directory-mod.c
@@ -0,0 +1 @@
+void foo (void) {}
diff --git a/elf/tst-non-directory-path.c b/elf/tst-non-directory-path.c
new file mode 100644
index 00000000..1016a97a
--- /dev/null
+++ b/elf/tst-non-directory-path.c
@@ -0,0 +1,7 @@
+extern void foo (void);
+
+int main (int argc, char *argv[])
+{
+ foo ();
+ return 0;
+}
diff --git a/elf/tst-non-directory-path.sh b/elf/tst-non-directory-path.sh
new file mode 100755
index 00000000..e804a445
--- /dev/null
+++ b/elf/tst-non-directory-path.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+# Test if library search path does not terminates with non-directory
+# components.
+# Copyright (C) 2023 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+#
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
+
+set -e
+
+rtld=$1
+test_program=$2
+test_wrapper_env=$3
+run_program_env=$4
+# Remove the last space to allow concatenate extra paths.
+library_path=$(echo $5)
+objpfx=$6
+
+test_binary=$(basename ${test_program})
+test_libpath=${test_binary}-x
+
+mkdir -p ${objpfx}/${test_libpath}
+mv ${objpfx}/tst-non-directory-mod.so ${objpfx}/${test_libpath}
+
+# Check with absolute paths.
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --inhibit-cache \
+ --library-path \
+ "$library_path":"${objpfx}"tst-non-directory-invalid:"${objpfx}"${test_libpath} \
+ $test_program 2>&1 && rc=0 || rc=$?
+
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --inhibit-cache \
+ --library-path \
+ "$library_path":"${objpfx}"${test_binary}:"${objpfx}"${test_libpath} \
+ $test_program 2>&1 && rc=0 || rc=$?
+
+# Relative paths along with non-existent path in search list.
+cd "$objpfx"
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --inhibit-cache \
+ --library-path \
+ "$library_path":../elf/tst-non-directory-invalid::../elf/${test_libpath} \
+ $test_program 2>&1 && rc=0 || rc=$?
+
+# Relative paths along with component in the path is not a directory in search list.
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --inhibit-cache \
+ --library-path \
+ "$library_path":../elf/${test_binary}:../elf/${test_libpath} \
+ $test_program 2>&1 && rc=0 || rc=$?
+
+# Relative paths along with non-existent path and a component in the path that is not a directory.
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --inhibit-cache \
+ --library-path \
+ "$library_path":../elf/tst-non-directory-invalid:../elf/${test_binary}:../elf/${test_libpath} \
+ $test_program 2>&1 && rc=0 || rc=$?
+
+exit $rc
--
2.27.0
|
