aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-20 07:29:15 -0400
committerMike Frysinger <vapier@gentoo.org>2015-07-20 22:01:34 -0400
commit716f049a55a42d97c0e9e82cc0a7d4b609456f8f (patch)
tree7e3694aea006c419a424cd173986fab3f3f9941f
parent2511fe206c59793d25bf0e3e24a185545b3a93b6 (diff)
downloadtermbaud-gentoo/2.20.tar.gz
termbaud-gentoo/2.20.tar.xz
termbaud-gentoo/2.20.zip
sparc: fix sigaction for 32bit builds [BZ #18694]gentoo/2.20
Commit a059d359d86130b5fa74e04a978c8523a0293f77 changed the sigaction struct to pass conform tests, but it ended up also changing the ABI for 32 bit builds. For 64 bit builds, changing the long to two ints works, but for 32 bit builds, it inserts 4 extra bytes. This leads to many packages randomly failing like bash that spews things like: configure: line 471: wait_for: No record of process 0 Bracket the new member by a wordsize check to fix the ABI for 32bit. (cherry picked from commit 7fde904c73c57faea48c9679bbdc0932d81b3a2f) (cherry picked from commit ed99e5f9cc6471745488f269d16ee5b127944a85)
-rw-r--r--ChangeLog7
-rw-r--r--NEWS6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/sigaction.h4
3 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ccce486c9d6..d9cbce76d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-21 Mike Frysinger <vapier@gentoo.org>
+
+ [BZ #18694]
+ * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Include
+ bits/wordsize.h.
+ (sigaction): Declare __glibc_reserved0 only when __WORDSIZE is 64.
+
2015-02-16 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #16618]
diff --git a/NEWS b/NEWS
index 976f2ea0236..b469ad2b501 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.20.1
* The following bugs are resolved with this release:
16009, 16617, 16618, 17266, 17370, 17371, 17460, 17485, 17555, 17625,
- 17630, 17801.
+ 17630, 17801, 18694.
* CVE-2015-1472 Under certain conditions wscanf can allocate too little
memory for the to-be-scanned arguments and overflow the allocated
@@ -29,6 +29,10 @@ Version 2.20.1
* CVE-2014-9402 The nss_dns implementation of getnetbyname could run into an
infinite loopif the DNS response contained a PTR record of an unexpected
format.
+
+* The 32-bit sparc sigaction ABI was inadvertently broken in the 2.20 release.
+ It has been fixed to match 2.19 and older, but binaries built against 2.20
+ might need to be recompiled. See BZ#18694.
Version 2.20
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
index 7a0ca7eea22..b1b121d9b74 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
@@ -20,6 +20,8 @@
# error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
#endif
+#include <bits/wordsize.h>
+
/* Structure describing the action to be taken when a signal arrives. */
struct sigaction
{
@@ -43,7 +45,9 @@ struct sigaction
__sigset_t sa_mask;
/* Special flags. */
+#if __WORDSIZE == 64
int __glibc_reserved0;
+#endif
int sa_flags;
/* Not used by Linux/Sparc yet. */