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 09:42:44 +0100
commitdcaf51b41e259387602774829c45222d0507f90a (patch)
tree074ce66a45b10732f2f8d78856b469b46c84dfc7
parentb3c51635efb532dd0544e6f4dedd6a184f0ae1a2 (diff)
downloadglibc-dcaf51b41e259387602774829c45222d0507f90a.zip
glibc-dcaf51b41e259387602774829c45222d0507f90a.tar.gz
glibc-dcaf51b41e259387602774829c45222d0507f90a.tar.bz2
elf: Change ldconfig auxcache magic number (bug 32231)
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 8a8a922..5aef543 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ The following bugs are resolved with this release:
[32026] strerror/strsignal TLS not handled correctly for secondary namespaces
[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.39
diff --git a/elf/cache.c b/elf/cache.c
index 8a618e1..62d681d 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -820,7 +820,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
{