Skip to contentSkip to conversation

eglibc: add security patch for CVE-2013-4788

PATCH New Gustavo Zacarias 4 participants 8 messages Nov 27, 2013 – Nov 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 eglibc: add security patch for CVE-2013-4788

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4788
http://hmarco.org/bugs/CVE-2013-4788.html

---
 .../2.17-svnr22064/eglibc-0001-ptr_mangle.patch    | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch
package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch new file +35 -0
new file mode 100644
index 0000000..c9bf107
@@ -0,0 +1,35 @@
+Fix for CVE-2013-4788 from http://hmarco.org/bugs/CVE-2013-4788.html
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -rupN glibc-2.17/csu/libc-start.c glibc-2.17-mangle-fix/csu/libc-start.c
+--- glibc-2.17/libc/csu/libc-start.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17-mangle-fix/libc/csu/libc-start.c	2013-07-10 00:13:48.000000000 +0200
+@@ -38,6 +38,12 @@ extern void __pthread_initialize_minimal
+    in thread local area.  */
+ uintptr_t __stack_chk_guard attribute_relro;
+ # endif
++
++# ifndef  THREAD_SET_POINTER_GUARD
++uintptr_t __pointer_chk_guard_local
++     attribute_relro attribute_hidden __attribute__ ((nocommon));
++# endif
++
+ #endif
+ 
+ #ifdef HAVE_PTR_NTHREADS
+@@ -184,6 +190,14 @@ LIBC_START_MAIN (int (*main) (int, char
+ # else
+   __stack_chk_guard = stack_chk_guard;
+ # endif
++    uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
++                          stack_chk_guard);
++# ifdef THREAD_SET_POINTER_GUARD
++      THREAD_SET_POINTER_GUARD (pointer_chk_guard);
++# else
++      __pointer_chk_guard_local = pointer_chk_guard;
++# endif
++
+ #endif
+ 
+   /* Register the destructor of the dynamic linker if there is any.  */
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

It's tested to be far more stable than uClibc.

---
 board/qemu/mips64-malta/readme.txt  | 2 --
 configs/qemu_mips64_malta_defconfig | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)
board/qemu/mips64-malta/readme.txt +0 -2
index 4fa8a19..b655922 100644
@@ -6,6 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-This configuration is known to be flaky.
-
 Tested with QEMU 1.6.1
configs/qemu_mips64_malta_defconfig +1 -2
index e1295dd..011b9c6 100644
@@ -3,8 +3,7 @@ BR2_mips64=y
 BR2_MIPS_NABI64=y
 
 # Toolchain
-# uClibc dynamic loader seems broken for mips64
-BR2_PREFER_STATIC_LIB=y
+BR2_TOOLCHAIN_BUILDROOT_EGLIBC=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

Dear Gustavo Zacarias,

configs/qemu_mips64_malta_defconfig BR2_mips64=y · line 7

Quoted 3 lines · Gustavo Zacarias

# Toolchain

configs/qemu_mips64_malta_defconfig +0 -2
-# uClibc dynamic loader seems broken for mips64
-BR2_PREFER_STATIC_LIB=y

I think the broken dynamic loader for mips64 in uClibc is now fixed by package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

Quoted 2 lines · Thomas Petazzoni

I think the broken dynamic loader for mips64 in uClibc is now fixed by package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch.

Probably, but besides that it's generally unstable with uClibc (you almost certainly can't login properly) where with eglibc it just works(tm). Though maybe it just needs a little kick like the recent SIGBUS mips64 patch from the uclibc mailing list.
Regards.

#4 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias
Quoted 2 lines · Thomas Petazzoni

I think the broken dynamic loader for mips64 in uClibc is now fixed by package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch.

Probably, but besides that it's generally unstable with uClibc (you almost certainly can't login properly) where with eglibc it just works(tm). Though maybe it just needs a little kick like the recent SIGBUS mips64 patch from the uclibc mailing list.

Ok. Then, should we make (e)glibc the default C library for mips64, so that users will not have a non-working system if they simply build a basic default configuration for mips64 (which will use uClibc) ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

Quoted 3 lines · Thomas Petazzoni

Ok. Then, should we make (e)glibc the default C library for mips64, so that users will not have a non-working system if they simply build a basic default configuration for mips64 (which will use uClibc) ?

Yes, i'll test other combinations (mips64 O32/N32/N64) to see what's best for each scenario before sending a patch.
Regards.

#6 lore raw

PATCH 2/2 qemu/mips64-malta: switch to eglibc

In reply to Gustavo Zacarias
Quoted 25 lines · Gustavo Zacarias

It's tested to be far more stable than uClibc.

---
  board/qemu/mips64-malta/readme.txt  | 2 --
  configs/qemu_mips64_malta_defconfig | 3 +--
  2 files changed, 1 insertion(+), 4 deletions(-)
board/qemu/mips64-malta/readme.txt +0 -2
index 4fa8a19..b655922 100644
@@ -6,6 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
  graphical window is the framebuffer. No keyboard support has been
  enabled.
 
-This configuration is known to be flaky.
-
  Tested with QEMU 1.6.1
configs/qemu_mips64_malta_defconfig +0 -0
index e1295dd..011b9c6 100644

configs/qemu_mips64_malta_defconfig BR2_mips64=y · line 9

Quoted 9 lines
configs/qemu_mips64_malta_defconfig +1 -2
@@ -3,8 +3,7 @@ BR2_mips64=y
  BR2_MIPS_NABI64=y
 
  # Toolchain
-# uClibc dynamic loader seems broken for mips64
-BR2_PREFER_STATIC_LIB=y
+BR2_TOOLCHAIN_BUILDROOT_EGLIBC=y
 
  # Filesystem
  BR2_TARGET_ROOTFS_EXT2=y

Looks good to me.

Signature · 1 line
markos