aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2024-10-28 14:45:30 +0100
committerFlorian Weimer <fweimer@redhat.com>2024-10-29 10:16:26 +0100
commitb3b68740cf00431b056ad570a3e954fc20f76f1d (patch)
treefafe5403ea168bb987dcde78ea27b1a88b82790a
parent485b2a773d19fe551a9e692c804d0a13b1355396 (diff)
downloadglibc-release/2.36/master.zip
glibc-release/2.36/master.tar.gz
glibc-release/2.36/master.tar.bz2
elf: Change ldconfig auxcache magic number (bug 32231)release/2.36/master
In commit c628c2296392ed3bf2cb8d8470668e64fe53389f (elf: Remove ldconfig kernel version check), the layout of auxcache entries changed because the osversion field was removed from struct aux_cache_file_entry. However, AUX_CACHEMAGIC was not changed, so existing files are still used, potentially leading to unintended ldconfig behavior. This commit changes AUX_CACHEMAGIC, so that the file is regenerated. Reported-by: DJ Delorie <dj@redhat.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> (cherry picked from commit 0a536f6e2f76e3ef581b3fd9af1e5cf4ddc7a5a2)
-rw-r--r--NEWS1
-rw-r--r--elf/cache.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3437574..30a3eaa 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,7 @@ The following bugs are resolved with this release:
[31968] mremap implementation in C does not handle arguments correctly
[32052] Name space violation in fortify wrappers
[32137] libio: Attempt wide backup free only for non-legacy code
+ [32231] elf: Change ldconfig auxcache magic number
Version 2.36
diff --git a/elf/cache.c b/elf/cache.c
index 3d7d3a6..528a8ba 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -845,7 +845,7 @@ struct aux_cache_entry
struct aux_cache_entry *next;
};
-#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0"
+#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-2.0"
struct aux_cache_file_entry
{