lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Use get_desc_base()

Browse Source 
Use get_desc_base() to get the base address in desc_struct

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718150853.GA11294@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Akinobu Mita
2009-07-19 00:08:54 +09:00
committed by Ingo Molnar
parent 78af08d90b
commit 254e0a6bff
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/doublefault_32.c
View File

@@ -27,9 +27,7 @@ static void doublefault_fn(void)
if (ptr_ok(gdt)) { if (ptr_ok(gdt)) {
gdt += GDT_ENTRY_TSS << 3; gdt += GDT_ENTRY_TSS << 3;
tss = *(u16 *)(gdt+2); tss = get_desc_base((struct desc_struct *)gdt);
tss += *(u8 *)(gdt+4) << 16;
tss += *(u8 *)(gdt+7) << 24;
printk(KERN_EMERG "double fault, tss at %08lx\n", tss); printk(KERN_EMERG "double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) { if (ptr_ok(tss)) {

9
arch/x86/kernel/step.c
View File

@@ -4,6 +4,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/desc.h>
unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs) unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs)
{ {
@@ -23,7 +24,7 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
* and APM bios ones we just ignore here. * and APM bios ones we just ignore here.
*/ */
if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) { if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) {
u32 *desc; struct desc_struct *desc;
unsigned long base; unsigned long base;
seg &= ~7UL; seg &= ~7UL;
@@ -33,12 +34,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
addr = -1L; /* bogus selector, access would fault */ addr = -1L; /* bogus selector, access would fault */
else { else {
desc = child->mm->context.ldt + seg; desc = child->mm->context.ldt + seg;
base = ((desc[0] >> 16) | base = get_desc_base(desc);
((desc[1] & 0xff) << 16) |
(desc[1] & 0xff000000));
/* 16-bit code segment? */ /* 16-bit code segment? */
if (!((desc[1] >> 22) & 1)) if (!desc->d)
addr &= 0xffff; addr &= 0xffff;
addr += base; addr += base;
} }