diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | dlfcn/Makefile | 3 | ||||
| -rw-r--r-- | elf/tst-addr1.c | 9 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 10 | ||||
| -rw-r--r-- | nptl/ChangeLog | 10 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_wrlock.c | 6 |
10 files changed, 51 insertions, 20 deletions
@@ -1,3 +1,14 @@ +2006-08-31 Jakub Jelinek <jakub@redhat.com> + + * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Add + ld.so. + + * malloc/malloc.c (_int_malloc): Use full list insert and not + shortcut which assumes the list is empty for large requests + too. + + * elf/tst-addr1.c (do_test): Allow i.dli_sname "_IO_printf". + 2006-08-30 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (splice): Add offin diff --git a/dlfcn/Makefile b/dlfcn/Makefile index ffdb70ea68..63e7b31b2a 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -136,7 +136,8 @@ $(objpfx)bug-atexit2.out: $(objpfx)bug-atexit2-lib.so $(objpfx)bug-atexit2-lib.so: $(common-objpfx)libc.so \ $(common-objpfx)libc_nonshared.a -LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(common-objpfx)libc_nonshared.a +LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(common-objpfx)elf/ld.so \ + $(common-objpfx)libc_nonshared.a $(objpfx)bug-atexit3: $(libdl) $(objpfx)bug-atexit3.out: $(objpfx)bug-atexit3-lib.so $(objpfx)bug-atexit3-lib.so: $(common-objpfx)libc.so \ diff --git a/elf/tst-addr1.c b/elf/tst-addr1.c index 3a2cbb668f..637906e206 100644 --- a/elf/tst-addr1.c +++ b/elf/tst-addr1.c @@ -12,7 +12,14 @@ do_test (void) return 1; } printf ("found symbol %s in %s\n", i.dli_sname, i.dli_fname); - return i.dli_sname == NULL || strcmp (i.dli_sname, "printf") != 0; + return i.dli_sname == NULL + || (strcmp (i.dli_sname, "printf") != 0 + /* On architectures which create PIC code by default + &printf may resolve to an address in libc.so + rather than in the binary. printf and _IO_printf + are aliased and which one comes first in the + hash table is up to the linker. */ + && strcmp (i.dli_sname, "_IO_printf") != 0); } #define TEST_FUNCTION do_test () diff --git a/fedora/branch.mk b/fedora/branch.mk index 32a0feccd1..42e132217e 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc4 -fedora-sync-date := 2006-08-31 06:40 UTC -fedora-sync-tag := fedora-glibc-20060831T0640 +fedora-sync-date := 2006-08-31 18:12 UTC +fedora-sync-tag := fedora-glibc-20060831T1812 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 519c50d449..820e98a303 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 27 +%define glibcrelease 28 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -1448,6 +1448,9 @@ rm -f *.filelist* %endif %changelog +* Thu Aug 31 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-28 +- another malloc doubly linked list corruption problem fix (#204653) + * Thu Aug 31 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-27 - allow $LIB and $PLATFORM in dlopen parameters even in suid/sgid (#204399) - fix splice prototype (#204530) diff --git a/malloc/malloc.c b/malloc/malloc.c index d37e521367..206f3e1b6a 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4230,8 +4230,14 @@ _int_malloc(mstate av, size_t bytes) /* Split */ else { remainder = chunk_at_offset(victim, nb); - unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder; - remainder->bk = remainder->fd = unsorted_chunks(av); + /* We cannot assume the unsorted list is empty and therefore + have to perform a complete insert here. */ + bck = unsorted_chunks(av); + fwd = bck->fd; + remainder->bk = bck; + remainder->fd = fwd; + bck->fd = remainder; + fwd->bk = remainder; set_head(victim, nb | PREV_INUSE | (av != &main_arena ? NON_MAIN_ARENA : 0)); set_head(remainder, remainder_size | PREV_INUSE); diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2c9c9e2732..4e3bf38bfd 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,13 @@ +2006-08-31 Ulrich Drepper <drepper@redhat.com> + + * pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Undo last + change because it can disturb too much existing code. If real hard + reader preference is needed we'll introduce another type. + * sysdeps/pthread/pthread_rwlock_timedwrlock.c + (pthread_rwlock_timedwrlock): Likewise. + * sysdeps/pthread/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock): + Likewise. + 2006-08-30 Ulrich Drepper <drepper@redhat.com> * pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Respect diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index 63760064c5..b754a19565 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -30,10 +30,7 @@ __pthread_rwlock_trywrlock (rwlock) lll_mutex_lock (rwlock->__data.__lock); - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - /* Respect the preference. */ - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); result = 0; diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c index ab7bc7babb..97c0598f96 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -40,9 +40,7 @@ pthread_rwlock_timedwrlock (rwlock, abstime) int err; /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); diff --git a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c index 4d967f2496..822aeed79c 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -37,9 +37,7 @@ __pthread_rwlock_wrlock (rwlock) while (1) { /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); |