53f4d259fa
Upstream commit: fffc2df8a3e2c8cda2991063d23086360268b777 - i386: Provide GLIBC_ABI_GNU_TLS symbol version [BZ #33221] - i386: Update ___tls_get_addr to preserve vector registers - Extend struct r_debug to support multiple namespaces (RHEL-101985) - Fix a potential crash in the dynamic loader when processing specific symbol versions (RHEL-109683) - Signal la_objopen for ld.so with dlmopen (RHEL-109693) - Switch to main malloc after final ld.so self-relocation (RHEL-109703) - Prevent ld.so from asserting and crashing during audited library loads (RHEL-109702) - x86-64: Provide GLIBC_ABI_DT_X86_64_PLT symbol version (RHEL-109621) - x86-64, i386: Provide GLIBC_ABI_GNU2_TLS symbol version (RHEL-109625) - Ensure fallback initialization of ctype TLS data pointers to fix segfaults in programs using dlmopen or auditors (RHEL-72018) - Handle load segment gaps in _dl_find_object (RHEL-104854) - AArch64: Improve codegen in SVE log1p - AArch64: Optimize inverse trig functions - AArch64: Avoid memset ifunc in cpu-features.c [BZ #33112] Resolves: RHEL-109536 Resolves: RHEL-72018 Resolves: RHEL-101985 Resolves: RHEL-104854 Resolves: RHEL-109621 Resolves: RHEL-109625 Resolves: RHEL-109683 Resolves: RHEL-109693 Resolves: RHEL-109702 Resolves: RHEL-109703
104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
commit 9fa7cc6a0b388ed16cf8a8976de5f5882882d503
|
|
Author: Adam Sampson <ats@offog.org>
|
|
Date: Mon May 6 18:16:32 2024 +0100
|
|
|
|
ldconfig: Move endswithn into a new header file
|
|
|
|
is_gdb_python_file is doing a similar test, so it can use this helper
|
|
function as well.
|
|
|
|
Signed-off-by: Adam Sampson <ats@offog.org>
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit ed2b8d3a866eb37e069f6a71bdf10421cd4c5e54)
|
|
|
|
diff --git a/elf/endswith.h b/elf/endswith.h
|
|
new file mode 100644
|
|
index 0000000000000000..c6430c48be0c1071
|
|
--- /dev/null
|
|
+++ b/elf/endswith.h
|
|
@@ -0,0 +1,33 @@
|
|
+/* Copyright (C) 2023-2024 Free Software Foundation, Inc.
|
|
+ This file is part of the GNU C Library.
|
|
+
|
|
+ This program is free software; you can redistribute it and/or modify
|
|
+ it under the terms of the GNU General Public License as published
|
|
+ by the Free Software Foundation; version 2 of the License, or
|
|
+ (at your option) any later version.
|
|
+
|
|
+ This program 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 General Public License for more details.
|
|
+
|
|
+ You should have received a copy of the GNU General Public License
|
|
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
|
+
|
|
+#ifndef _ENDSWITH_H
|
|
+#define _ENDSWITH_H
|
|
+
|
|
+#include <string.h>
|
|
+
|
|
+/* Return true if the N bytes at NAME end with with the characters in
|
|
+ the string SUFFIX. (NAME[N + 1] does not have to be a null byte.)
|
|
+ Expected to be called with a string literal for SUFFIX. */
|
|
+static inline bool
|
|
+endswithn (const char *name, size_t n, const char *suffix)
|
|
+{
|
|
+ return (n >= strlen (suffix)
|
|
+ && memcmp (name + n - strlen (suffix), suffix,
|
|
+ strlen (suffix)) == 0);
|
|
+}
|
|
+
|
|
+#endif /* _ENDSWITH_H */
|
|
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
|
|
index b64c54b53e1aa5bf..0f3ef707dd2f721d 100644
|
|
--- a/elf/ldconfig.c
|
|
+++ b/elf/ldconfig.c
|
|
@@ -40,6 +40,7 @@
|
|
#include <libgen.h>
|
|
|
|
#include <ldconfig.h>
|
|
+#include <endswith.h>
|
|
#include <dl-cache.h>
|
|
#include <dl-hwcaps.h>
|
|
#include <dl-is_dso.h>
|
|
@@ -661,17 +662,6 @@ struct dlib_entry
|
|
struct dlib_entry *next;
|
|
};
|
|
|
|
-/* Return true if the N bytes at NAME end with with the characters in
|
|
- the string SUFFIX. (NAME[N + 1] does not have to be a null byte.)
|
|
- Expected to be called with a string literal for SUFFIX. */
|
|
-static inline bool
|
|
-endswithn (const char *name, size_t n, const char *suffix)
|
|
-{
|
|
- return (n >= strlen (suffix)
|
|
- && memcmp (name + n - strlen (suffix), suffix,
|
|
- strlen (suffix)) == 0);
|
|
-}
|
|
-
|
|
/* Skip some temporary DSO files. These files may be partially written
|
|
and lead to ldconfig crashes when examined. */
|
|
static bool
|
|
diff --git a/elf/readlib.c b/elf/readlib.c
|
|
index 4d67c7413649be30..32e8b8eb2298c9dd 100644
|
|
--- a/elf/readlib.c
|
|
+++ b/elf/readlib.c
|
|
@@ -33,6 +33,7 @@
|
|
#include <gnu/lib-names.h>
|
|
|
|
#include <ldconfig.h>
|
|
+#include <endswith.h>
|
|
|
|
#define Elf32_CLASS ELFCLASS32
|
|
#define Elf64_CLASS ELFCLASS64
|
|
@@ -48,7 +49,7 @@ static bool
|
|
is_gdb_python_file (const char *name)
|
|
{
|
|
size_t len = strlen (name);
|
|
- return len > 7 && strcmp (name + len - 7, "-gdb.py") == 0;
|
|
+ return endswithn (name, len, "-gdb.py");
|
|
}
|
|
|
|
/* Returns 0 if everything is ok, != 0 in case of error. */
|