Author: aurel32
Date: 2015-03-12 19:09:12 +0000 (Thu, 12 Mar 2015)
New Revision: 6372
Added:
glibc-package/trunk/debian/patches/any/cvs-ldconfig-aux-cache.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/any/cvs-ldconfig-aux-cache.diff: new patch from upstream to
ignore corrupted aux-cache instead of segfaulting. Closes: #759530.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-03-08 21:29:32 UTC (rev
6371)
+++ glibc-package/trunk/debian/changelog 2015-03-12 19:09:12 UTC (rev
6372)
@@ -16,6 +16,8 @@
(<< 2.19)" added to libc6. It's now time to add the missing "Depends:
libc-bin (>> 2.19)" to locales and remove the transition mechanism.
Closes: #583088, #779442
+ * patches/any/cvs-ldconfig-aux-cache.diff: new patch from upstream to
+ ignore corrupted aux-cache instead of segfaulting. Closes: #759530.
-- Aurelien Jarno <[email protected]> Sun, 08 Feb 2015 17:21:50 +0100
Added: glibc-package/trunk/debian/patches/any/cvs-ldconfig-aux-cache.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ldconfig-aux-cache.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-ldconfig-aux-cache.diff
2015-03-12 19:09:12 UTC (rev 6372)
@@ -0,0 +1,20 @@
+2015-03-11 Aurelien Jarno <[email protected]>
+
+ [BZ #18093]
+ * elf/cache.c (load_aux_cache): Regenerate the cache if it has
+ the wrong size.
+
+diff --git a/elf/cache.c b/elf/cache.c
+--- a/elf/cache.c
++++ b/elf/cache.c
+@@ -698,7 +698,9 @@ load_aux_cache (const char *aux_cache_name)
+ if (aux_cache == MAP_FAILED
+ || aux_cache_size < sizeof (struct aux_cache_file)
+ || memcmp (aux_cache->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1)
+- || aux_cache->nlibs >= aux_cache_size)
++ || aux_cache_size != (sizeof(struct aux_cache_file) +
++ aux_cache->nlibs * sizeof(struct
aux_cache_file_entry) +
++ aux_cache->len_strings))
+ {
+ close (fd);
+ init_aux_cache ();
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2015-03-08 21:29:32 UTC (rev
6371)
+++ glibc-package/trunk/debian/patches/series 2015-03-12 19:09:12 UTC (rev
6372)
@@ -271,3 +271,4 @@
any/cvs-getnetbyname.diff
any/cvs-vfprintf.diff
any/cvs-wscanf.diff
+any/cvs-ldconfig-aux-cache.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
