[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#857307: unblock: musl/1.1.16-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package musl

1.1.16-3 includes a fix for applications crashing on startup on ppc64(el)
(#857078).
Attached is the debdiff.

Thanks in advance!

Kind regards,
  Reiner

unblock musl/1.1.16-3
diff -Nru musl-1.1.16/debian/changelog musl-1.1.16/debian/changelog
--- musl-1.1.16/debian/changelog	2017-01-22 18:18:26.000000000 +0100
+++ musl-1.1.16/debian/changelog	2017-03-09 19:19:31.000000000 +0100
@@ -1,3 +1,10 @@
+musl (1.1.16-3) unstable; urgency=medium
+
+  * Import upstream fix for PPC64 crash.
+    Thanks to Breno Leitao for investigating. (Closes: #857078)
+
+ -- Reiner Herrmann <reiner@reiner-h.de>  Thu, 09 Mar 2017 19:19:31 +0100
+
 musl (1.1.16-2) unstable; urgency=medium
 
   [ Breno Leitao ]
diff -Nru musl-1.1.16/debian/patches/ppc64-crash.patch musl-1.1.16/debian/patches/ppc64-crash.patch
--- musl-1.1.16/debian/patches/ppc64-crash.patch	1970-01-01 01:00:00.000000000 +0100
+++ musl-1.1.16/debian/patches/ppc64-crash.patch	2017-03-09 19:10:03.000000000 +0100
@@ -0,0 +1,29 @@
+From: Rich Felker <dalias@aerifal.cx>
+Subject: fix ld-behavior-dependent crash in ppc64 ldso startup
+Origin: upstream, http://git.musl-libc.org/cgit/musl/commit/?id=fc85fb38605a8bf341c367b8ab0d36edab2bdbfc
+Bug: http://www.openwall.com/lists/musl/2017/03/07/2
+Bug-Debian: https://bugs.debian.org/857078
+
+the 32-bit pc-relative address for stage 2 of dynamic linker entry was
+wrongly loaded with a zero-extending load instead of sign-extending
+load, resulting in an invalid jump if the offset happened to be
+negative, which depends on the linker's ordering of text sections.
+---
+ arch/powerpc64/reloc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc64/reloc.h b/arch/powerpc64/reloc.h
+index e1bad00..faf70ac 100644
+--- a/arch/powerpc64/reloc.h
++++ b/arch/powerpc64/reloc.h
+@@ -27,6 +27,6 @@
+ 	"	bl 1f \n" \
+ 	"	.long " #sym "-. \n" \
+ 	"1:	mflr %1 \n" \
+-	"	lwz %0, 0(%1) \n" \
++	"	lwa %0, 0(%1) \n" \
+ 	"	add %0, %0, %1 \n" \
+ 	: "=r"(*(fp)), "=r"((long){0}) : : "memory", "lr" )
+-- 
+cgit v0.11.2
+
diff -Nru musl-1.1.16/debian/patches/series musl-1.1.16/debian/patches/series
--- musl-1.1.16/debian/patches/series	2017-01-22 17:54:16.000000000 +0100
+++ musl-1.1.16/debian/patches/series	2017-03-09 19:08:03.000000000 +0100
@@ -1,2 +1,3 @@
 arm-object_arch.patch
 dpkg-gcc-specs.diff
+ppc64-crash.patch

Reply to: