[PATCH 3.12 024/142] parisc: Fix __ARCH_SI_PREAMBLE_SIZE

From: Jiri Slaby
Date: Wed Feb 24 2016 - 06:17:55 EST

From: Helge Deller <deller@xxxxxx>

3.12-stable review patch. If anyone has any objections, please let me know.


commit e60fc5aa608eb38b47ba4ee058f306f739eb70a0 upstream.

On a 64bit kernel build the compiler aligns the _sifields union in the
struct siginfo_t on a 64bit address. The __ARCH_SI_PREAMBLE_SIZE define
compensates for this alignment and thus fixes the wait testcase of the
strace package.

The symptoms of a wrong __ARCH_SI_PREAMBLE_SIZE value is that
_sigchld.si_stime variable is missed to be copied and thus after a
copy_siginfo() will have uninitialized values.

Signed-off-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
arch/parisc/include/uapi/asm/siginfo.h | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/parisc/include/uapi/asm/siginfo.h b/arch/parisc/include/uapi/asm/siginfo.h
index d7034728f377..1c75565d984b 100644
--- a/arch/parisc/include/uapi/asm/siginfo.h
+++ b/arch/parisc/include/uapi/asm/siginfo.h
@@ -1,6 +1,10 @@

+#if defined(__LP64__)
+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
#include <asm-generic/siginfo.h>