Skip to content

Commit 1022623

Browse files
Robert RichterH. Peter Anvin
Robert Richter
authored and
H. Peter Anvin
committed
x86-32: Fix invalid stack address while in softirq
In 32 bit the stack address provided by kernel_stack_pointer() may point to an invalid range causing NULL pointer access or page faults while in NMI (see trace below). This happens if called in softirq context and if the stack is empty. The address at &regs->sp is then out of range. Fixing this by checking if regs and &regs->sp are in the same stack context. Otherwise return the previous stack pointer stored in struct thread_info. If that address is invalid too, return address of regs. BUG: unable to handle kernel NULL pointer dereference at 0000000a IP: [<c1004237>] print_context_stack+0x6e/0x8d *pde = 00000000 Oops: 0000 [#1] SMP Modules linked in: Pid: 4434, comm: perl Not tainted 3.6.0-rc3-oprofile-i386-standard-g4411a05 #4 Hewlett-Packard HP xw9400 Workstation/0A1Ch EIP: 0060:[<c1004237>] EFLAGS: 00010093 CPU: 0 EIP is at print_context_stack+0x6e/0x8d EAX: ffffe000 EBX: 0000000a ECX: f4435f94 EDX: 0000000a ESI: f4435f94 EDI: f4435f94 EBP: f5409ec0 ESP: f5409ea0 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 CR0: 8005003b CR2: 0000000a CR3: 34ac9000 CR4: 000007d0 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 DR6: ffff0ff0 DR7: 00000400 Process perl (pid: 4434, ti=f5408000 task=f5637850 task.ti=f4434000) Stack: 000003e8 ffffe000 00001ffc f4e39b00 00000000 0000000a f4435f94 c155198c f5409ef0 c1003723 c155198c f5409f04 00000000 f5409edc 00000000 00000000 f5409ee8 f4435f94 f5409fc4 00000001 f5409f1c c12dce1c 00000000 c155198c Call Trace: [<c1003723>] dump_trace+0x7b/0xa1 [<c12dce1c>] x86_backtrace+0x40/0x88 [<c12db712>] ? oprofile_add_sample+0x56/0x84 [<c12db731>] oprofile_add_sample+0x75/0x84 [<c12ddb5b>] op_amd_check_ctrs+0x46/0x260 [<c12dd40d>] profile_exceptions_notify+0x23/0x4c [<c1395034>] nmi_handle+0x31/0x4a [<c1029dc5>] ? ftrace_define_fields_irq_handler_entry+0x45/0x45 [<c13950ed>] do_nmi+0xa0/0x2ff [<c1029dc5>] ? ftrace_define_fields_irq_handler_entry+0x45/0x45 [<c13949e5>] nmi_stack_correct+0x28/0x2d [<c1029dc5>] ? ftrace_define_fields_irq_handler_entry+0x45/0x45 [<c1003603>] ? do_softirq+0x4b/0x7f <IRQ> [<c102a06f>] irq_exit+0x35/0x5b [<c1018f56>] smp_apic_timer_interrupt+0x6c/0x7a [<c1394746>] apic_timer_interrupt+0x2a/0x30 Code: 89 fe eb 08 31 c9 8b 45 0c ff 55 ec 83 c3 04 83 7d 10 00 74 0c 3b 5d 10 73 26 3b 5d e4 73 0c eb 1f 3b 5d f0 76 1a 3b 5d e8 73 15 <8b> 13 89 d0 89 55 e0 e8 ad 42 03 00 85 c0 8b 55 e0 75 a6 eb cc EIP: [<c1004237>] print_context_stack+0x6e/0x8d SS:ESP 0068:f5409ea0 CR2: 000000000000000a ---[ end trace 62afee3481b00012 ]--- Kernel panic - not syncing: Fatal exception in interrupt V2: * add comments to kernel_stack_pointer() * always return a valid stack address by falling back to the address of regs Reported-by: Yang Wei <[email protected]> Cc: <[email protected]> Signed-off-by: Robert Richter <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: H. Peter Anvin <[email protected]> Cc: Jun Zhang <[email protected]>
1 parent c1ddb48 commit 1022623

File tree

2 files changed

+32
-11
lines changed

2 files changed

+32
-11
lines changed

arch/x86/include/asm/ptrace.h

+4-11
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,14 @@ static inline bool user_64bit_mode(struct pt_regs *regs)
205205
}
206206
#endif
207207

208-
/*
209-
* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
210-
* when it traps. The previous stack will be directly underneath the saved
211-
* registers, and 'sp/ss' won't even have been saved. Thus the '&regs->sp'.
212-
*
213-
* This is valid only for kernel mode traps.
214-
*/
215-
static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
216-
{
217208
#ifdef CONFIG_X86_32
218-
return (unsigned long)(&regs->sp);
209+
extern unsigned long kernel_stack_pointer(struct pt_regs *regs);
219210
#else
211+
static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
212+
{
220213
return regs->sp;
221-
#endif
222214
}
215+
#endif
223216

224217
#define GET_IP(regs) ((regs)->ip)
225218
#define GET_FP(regs) ((regs)->bp)

arch/x86/kernel/ptrace.c

+28
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,34 @@ static inline bool invalid_selector(u16 value)
166166

167167
#define FLAG_MASK FLAG_MASK_32
168168

169+
/*
170+
* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
171+
* when it traps. The previous stack will be directly underneath the saved
172+
* registers, and 'sp/ss' won't even have been saved. Thus the '&regs->sp'.
173+
*
174+
* Now, if the stack is empty, '&regs->sp' is out of range. In this
175+
* case we try to take the previous stack. To always return a non-null
176+
* stack pointer we fall back to regs as stack if no previous stack
177+
* exists.
178+
*
179+
* This is valid only for kernel mode traps.
180+
*/
181+
unsigned long kernel_stack_pointer(struct pt_regs *regs)
182+
{
183+
unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
184+
unsigned long sp = (unsigned long)&regs->sp;
185+
struct thread_info *tinfo;
186+
187+
if (context == (sp & ~(THREAD_SIZE - 1)))
188+
return sp;
189+
190+
tinfo = (struct thread_info *)context;
191+
if (tinfo->previous_esp)
192+
return tinfo->previous_esp;
193+
194+
return (unsigned long)regs;
195+
}
196+
169197
static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
170198
{
171199
BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0);

0 commit comments

Comments
 (0)