diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 11:53:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 11:53:05 -0700 |
| commit | ea81e2722e55ba0269c92f266763e445dcffb973 (patch) | |
| tree | a582e2dabdf77a895418ad6bfa5deee2a197b499 /arch/s390/kernel/compat_ptrace.h | |
| parent | 0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be (diff) | |
| parent | b301ea8c81b13123761772f344faf606c76ba174 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: allow offline processing for disconnected devices
[S390] cio: handle ssch() return codes correctly.
[S390] cio: Correct cleanup on error.
[S390] CVE-2008-1514: prevent ptrace padding area read/write in 31-bit mode
Diffstat (limited to 'arch/s390/kernel/compat_ptrace.h')
| -rw-r--r-- | arch/s390/kernel/compat_ptrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h index cde81fa64f8..a2be3a978d5 100644 --- a/arch/s390/kernel/compat_ptrace.h +++ b/arch/s390/kernel/compat_ptrace.h @@ -42,6 +42,7 @@ struct user_regs_struct32 u32 gprs[NUM_GPRS]; u32 acrs[NUM_ACRS]; u32 orig_gpr2; + /* nb: there's a 4-byte hole here */ s390_fp_regs fp_regs; /* * These per registers are in here so that gdb can modify them |