diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-10-28 14:45:30 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-10-29 09:42:21 +0100 |
| commit | 3a34851103d554b2c9b269ecae111648f9d7bb6d (patch) | |
| tree | 07b5144ecc159a33598fb9486f82e8ac3eacd48a | |
| parent | 85e5850f2f4ea5f304be5356ecb7a15998766a4e (diff) | |
| download | glibc-3a34851103d554b2c9b269ecae111648f9d7bb6d.tar.gz glibc-3a34851103d554b2c9b269ecae111648f9d7bb6d.tar.xz glibc-3a34851103d554b2c9b269ecae111648f9d7bb6d.zip | |
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-- | NEWS | 1 | ||||
| -rw-r--r-- | elf/cache.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS index 9033335db1..928c516bec 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,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.40 diff --git a/elf/cache.c b/elf/cache.c index 8a618e11fa..62d681df42 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 { |