Sanitize the type of struct user.u_ar0
Subsystems (4)
PATCH 159/208 Sanitize the type of struct user.u_ar0
From: "H. Peter Anvin" <[email protected]>
struct user.u_ar0 is defined to contain a pointer offset on all architectures in which it is defined (all architectures which define an a.out format except SPARC.) However, it has a pointer type in the headers, which is pointless -- <asm/user.h> is not exported to userspace, and it just makes the code messy.
Redefine the field as "unsigned long" (which is the same size as a pointer on all Linux architectures) and change the setting code to user offsetof() instead of hand-coded arithmetic.
Cc Linux Arch Mailing List <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Roman Zippel <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Richard Henderson <[email protected]>
Cc Ivan Kokshaysky <[email protected]>
Cc Russell King <[email protected]>
Cc Lennert Buytenhek <[email protected]>
Cc Håvard Skinnemoen <[email protected]>
Cc Mikael Starvik <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc Tony Luck <[email protected]>
Cc Hirokazu Takata <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Paul Mundt <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/x86/ia32/ia32_aout.c | 3 +-- fs/binfmt_aout.c | 2 +- include/asm-alpha/user.h | 2 +- include/asm-arm/user.h | 2 +- include/asm-avr32/user.h | 2 +- include/asm-blackfin/user.h | 2 +- include/asm-cris/user.h | 2 +- include/asm-h8300/user.h | 3 +-- include/asm-ia64/user.h | 2 +- include/asm-m32r/user.h | 2 +- include/asm-m68k/user.h | 3 +-- include/asm-mips/user.h | 2 +- include/asm-powerpc/user.h | 2 +- include/asm-s390/user.h | 3 +-- include/asm-sh/user.h | 2 +- include/asm-v850/user.h | 2 +- include/asm-x86/user_32.h | 2 +- include/asm-x86/user_64.h | 2 +- 18 files changed, 18 insertions(+), 22 deletions(-)
arch/x86/ia32/ia32_aout.c renamed from arch/x86/ia32/ia32_aout.c~sanitize-the-type-of-struct-useru_ar0 +1 -2
@@ -172,8 +172,7 @@ static int aout_core_dump(long signr, st has_dumped =1 ; current->flags |=PF_DUMPCORE ;strncpy (dump.u_comm, current->comm,sizeof (current->comm)); - dump.u_ar0 = (u32)(((unsigned long )(&dump.regs)) - - ((unsigned long )(&dump))); + dump.u_ar0 = offsetof(struct user32 , regs); dump.signal = signr;dump_thread32 (regs, &dump);
fs/binfmt_aout.c renamed from fs/binfmt_aout.c~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -115,7 +115,7 @@ static int aout_core_dump(long signr, st current->flags |=PF_DUMPCORE ;strncpy (dump.u_comm, current->comm,sizeof (dump.u_comm));#ifndef __sparc__ - dump.u_ar0 = (void *)(((unsigned long )(&dump.regs)) - ((unsigned long )(&dump))); + dump.u_ar0 = offsetof(struct user , regs);#endif dump.signal = signr;dump_thread (regs, &dump);
include/asm-alpha/user.h renamed from include/asm-alpha/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -39,7 +39,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-arm/user.h renamed from include/asm-arm/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -67,7 +67,7 @@ struct user{esp register. */ long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ -struct pt_regs * u_ar0;/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ unsigned long magic;/* To uniquely identify a core file */ char u_comm[32 ];/* User command that was responsible */
include/asm-avr32/user.h renamed from include/asm-avr32/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -51,7 +51,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-blackfin/user.h renamed from include/asm-blackfin/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -75,7 +75,7 @@ struct user {esp register. */ long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ -struct user_regs_struct *u_ar0; +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ unsigned long magic;/* To uniquely identify a core file */
include/asm-cris/user.h renamed from include/asm-cris/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -38,7 +38,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-h8300/user.h renamed from include/asm-h8300/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -2
@@ -62,8 +62,7 @@ struct user{esp register. */ long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ -struct user_regs_struct *u_ar0; -/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ unsigned long magic;/* To uniquely identify a core file */ char u_comm[32 ];/* User command that was responsible */
include/asm-ia64/user.h renamed from include/asm-ia64/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -44,7 +44,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-m32r/user.h renamed from include/asm-m32r/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -38,7 +38,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-m68k/user.h renamed from include/asm-m68k/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -2
@@ -72,8 +72,7 @@ struct user{esp register. */ long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ -struct user_regs_struct *u_ar0; -/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ struct user_m68kfp_struct * u_fpstate;/* Math Co-processor pointer. */ unsigned long magic;/* To uniquely identify a core file */
include/asm-mips/user.h renamed from include/asm-mips/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -44,7 +44,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-powerpc/user.h renamed from include/asm-powerpc/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -38,7 +38,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-s390/user.h renamed from include/asm-s390/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -2
@@ -63,8 +63,7 @@ struct user {the top of the stack is always found in the esp register. */ long int signal;/* Signal that caused the core dump. */ -struct user_regs_struct *u_ar0; -/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ unsigned long magic;/* To uniquely identify a core file */ char u_comm[32 ];/* User command that was responsible */
include/asm-sh/user.h renamed from include/asm-sh/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -52,7 +52,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ struct user_fpu_struct * u_fpstate;/* Math Co-processor pointer */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */
include/asm-v850/user.h renamed from include/asm-v850/user.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -38,7 +38,7 @@ struct user {unsigned long start_data;/* data starting address */ unsigned long start_stack;/* stack starting address */ long int signal;/* signal causing core dump */ -struct regs * u_ar0;/* help gdb find registers */ +unsigned long u_ar0;/* help gdb find registers */ unsigned long magic;/* identifies a core file */ char u_comm[32 ];/* user command name */ };
include/asm-x86/user_32.h renamed from include/asm-x86/user_32.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -116,7 +116,7 @@ struct user{esp register. */ long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ -struct user_pt_regs * u_ar0;/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ struct user_i387_struct * u_fpstate;/* Math Co-processor pointer. */ unsigned long magic;/* To uniquely identify a core file */
include/asm-x86/user_64.h renamed from include/asm-x86/user_64.h~sanitize-the-type-of-struct-useru_ar0 +1 -1
@@ -118,7 +118,7 @@ struct user{long int signal;/* Signal that caused the core dump. */ int reserved;/* No longer used */ int pad1; -struct user_pt_regs * u_ar0;/* Used by gdb to help find the values for */ +unsigned long u_ar0;/* Used by gdb to help find the values for */ /* the registers. */ struct user_i387_struct * u_fpstate;/* Math Co-processor pointer. */ unsigned long magic;/* To uniquely identify a core file */
_