diff options
| author | Helge Deller <deller@gmx.de> | 2016-01-10 09:30:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-19 14:22:38 -0800 |
| commit | 4fdefe95e6c1607e0bfd14e11f53696989dc636d (patch) | |
| tree | 1580e3eb9ed87540b8a474649d8bd1f40bb2bed8 | |
| parent | fedff89dcaa254b09bd0e14ebf82e25912f9f77e (diff) | |
| download | linux-stable-4fdefe95e6c1607e0bfd14e11f53696989dc636d.tar.gz linux-stable-4fdefe95e6c1607e0bfd14e11f53696989dc636d.tar.bz2 linux-stable-4fdefe95e6c1607e0bfd14e11f53696989dc636d.zip | |
parisc: Fix __ARCH_SI_PREAMBLE_SIZE
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/parisc/include/uapi/asm/siginfo.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 @@ #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 |