| From | Ben Hutchings <> | Date | Mon, 08 Feb 2016 23:53:51 +0000 | Subject | [PATCH 3.2 45/87] parisc: Fix __ARCH_SI_PREAMBLE_SIZE |
| |
3.2.77-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <deller@gmx.de>
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@gmx.de> [bwh: Backported to 3.2: adjust filename] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- arch/parisc/include/asm/siginfo.h | 4 ++++ 1 file changed, 4 insertions(+)
--- a/arch/parisc/include/asm/siginfo.h +++ b/arch/parisc/include/asm/siginfo.h @@ -1,6 +1,10 @@ #ifndef _PARISC_SIGINFO_H #define _PARISC_SIGINFO_H +#if defined(__LP64__) +#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) +#endif + #include <asm-generic/siginfo.h> #undef NSIGTRAP
|