diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2006-12-06 20:14:02 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:02 -0500 |
commit | 66e10a44d724f1464b5e8b5a3eae1e2cbbc2cca6 (patch) | |
tree | 0d2a1a1d5edaf98506ef7cb271cad62f5644268e | |
parent | f95d47caae5302a63d92be9a0292abc90e2a14e1 (diff) |
[PATCH] i386: Fix places where using %gs changes the usermode ABI
There are a few places where the change in struct pt_regs and the use of %gs
affect the userspace ABI. These are primarily debugging interfaces where
thread state can be inspected or extracted.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
-rw-r--r-- | arch/i386/kernel/process.c | 6 | ||||
-rw-r--r-- | arch/i386/kernel/ptrace.c | 18 | ||||
-rw-r--r-- | include/asm-i386/elf.h | 2 | ||||
-rw-r--r-- | include/asm-i386/unwind.h | 1 |
4 files changed, 11 insertions, 16 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index 905364d4284..dc427254517 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c | |||
@@ -315,8 +315,8 @@ void show_regs(struct pt_regs * regs) | |||
315 | regs->eax,regs->ebx,regs->ecx,regs->edx); | 315 | regs->eax,regs->ebx,regs->ecx,regs->edx); |
316 | printk("ESI: %08lx EDI: %08lx EBP: %08lx", | 316 | printk("ESI: %08lx EDI: %08lx EBP: %08lx", |
317 | regs->esi, regs->edi, regs->ebp); | 317 | regs->esi, regs->edi, regs->ebp); |
318 | printk(" DS: %04x ES: %04x\n", | 318 | printk(" DS: %04x ES: %04x GS: %04x\n", |
319 | 0xffff & regs->xds,0xffff & regs->xes); | 319 | 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xgs); |
320 | 320 | ||
321 | cr0 = read_cr0(); | 321 | cr0 = read_cr0(); |
322 | cr2 = read_cr2(); | 322 | cr2 = read_cr2(); |
@@ -509,7 +509,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump) | |||
509 | dump->regs.ds = regs->xds; | 509 | dump->regs.ds = regs->xds; |
510 | dump->regs.es = regs->xes; | 510 | dump->regs.es = regs->xes; |
511 | savesegment(fs,dump->regs.fs); | 511 | savesegment(fs,dump->regs.fs); |
512 | savesegment(gs,dump->regs.gs); | 512 | dump->regs.gs = regs->xgs; |
513 | dump->regs.orig_eax = regs->orig_eax; | 513 | dump->regs.orig_eax = regs->orig_eax; |
514 | dump->regs.eip = regs->eip; | 514 | dump->regs.eip = regs->eip; |
515 | dump->regs.cs = regs->xcs; | 515 | dump->regs.cs = regs->xcs; |
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 775f50e9395..f3f94ac5736 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c | |||
@@ -94,13 +94,9 @@ static int putreg(struct task_struct *child, | |||
94 | return -EIO; | 94 | return -EIO; |
95 | child->thread.fs = value; | 95 | child->thread.fs = value; |
96 | return 0; | 96 | return 0; |
97 | case GS: | ||
98 | if (value && (value & 3) != 3) | ||
99 | return -EIO; | ||
100 | child->thread.gs = value; | ||
101 | return 0; | ||
102 | case DS: | 97 | case DS: |
103 | case ES: | 98 | case ES: |
99 | case GS: | ||
104 | if (value && (value & 3) != 3) | 100 | if (value && (value & 3) != 3) |
105 | return -EIO; | 101 | return -EIO; |
106 | value &= 0xffff; | 102 | value &= 0xffff; |
@@ -116,8 +112,8 @@ static int putreg(struct task_struct *child, | |||
116 | value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK; | 112 | value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK; |
117 | break; | 113 | break; |
118 | } | 114 | } |
119 | if (regno > GS*4) | 115 | if (regno > ES*4) |
120 | regno -= 2*4; | 116 | regno -= 1*4; |
121 | put_stack_long(child, regno - sizeof(struct pt_regs), value); | 117 | put_stack_long(child, regno - sizeof(struct pt_regs), value); |
122 | return 0; | 118 | return 0; |
123 | } | 119 | } |
@@ -131,18 +127,16 @@ static unsigned long getreg(struct task_struct *child, | |||
131 | case FS: | 127 | case FS: |
132 | retval = child->thread.fs; | 128 | retval = child->thread.fs; |
133 | break; | 129 | break; |
134 | case GS: | ||
135 | retval = child->thread.gs; | ||
136 | break; | ||
137 | case DS: | 130 | case DS: |
138 | case ES: | 131 | case ES: |
132 | case GS: | ||
139 | case SS: | 133 | case SS: |
140 | case CS: | 134 | case CS: |
141 | retval = 0xffff; | 135 | retval = 0xffff; |
142 | /* fall through */ | 136 | /* fall through */ |
143 | default: | 137 | default: |
144 | if (regno > GS*4) | 138 | if (regno > ES*4) |
145 | regno -= 2*4; | 139 | regno -= 1*4; |
146 | regno = regno - sizeof(struct pt_regs); | 140 | regno = regno - sizeof(struct pt_regs); |
147 | retval &= get_stack_long(child, regno); | 141 | retval &= get_stack_long(child, regno); |
148 | } | 142 | } |
diff --git a/include/asm-i386/elf.h b/include/asm-i386/elf.h index 3a05436f31c..45d21a0c95b 100644 --- a/include/asm-i386/elf.h +++ b/include/asm-i386/elf.h | |||
@@ -91,7 +91,7 @@ typedef struct user_fxsr_struct elf_fpxregset_t; | |||
91 | pr_reg[7] = regs->xds; \ | 91 | pr_reg[7] = regs->xds; \ |
92 | pr_reg[8] = regs->xes; \ | 92 | pr_reg[8] = regs->xes; \ |
93 | savesegment(fs,pr_reg[9]); \ | 93 | savesegment(fs,pr_reg[9]); \ |
94 | savesegment(gs,pr_reg[10]); \ | 94 | pr_reg[10] = regs->xgs; \ |
95 | pr_reg[11] = regs->orig_eax; \ | 95 | pr_reg[11] = regs->orig_eax; \ |
96 | pr_reg[12] = regs->eip; \ | 96 | pr_reg[12] = regs->eip; \ |
97 | pr_reg[13] = regs->xcs; \ | 97 | pr_reg[13] = regs->xcs; \ |
diff --git a/include/asm-i386/unwind.h b/include/asm-i386/unwind.h index 5031d693b89..601fc67bd77 100644 --- a/include/asm-i386/unwind.h +++ b/include/asm-i386/unwind.h | |||
@@ -71,6 +71,7 @@ static inline void arch_unw_init_blocked(struct unwind_frame_info *info) | |||
71 | info->regs.xss = __KERNEL_DS; | 71 | info->regs.xss = __KERNEL_DS; |
72 | info->regs.xds = __USER_DS; | 72 | info->regs.xds = __USER_DS; |
73 | info->regs.xes = __USER_DS; | 73 | info->regs.xes = __USER_DS; |
74 | info->regs.xgs = __KERNEL_PDA; | ||
74 | } | 75 | } |
75 | 76 | ||
76 | extern asmlinkage int arch_unwind_init_running(struct unwind_frame_info *, | 77 | extern asmlinkage int arch_unwind_init_running(struct unwind_frame_info *, |