diff options
| author | Renato Botelho <renato@netgate.com> | 2018-05-08 15:00:31 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2018-05-08 15:00:31 -0300 |
| commit | ed209f46dbcc4a79d277e0d2e93dc51a1f331be5 (patch) | |
| tree | 3e8b780ae0b551c955bb8e9b0296d5a93f3513fb /sys/amd64/amd64/mp_machdep.c | |
| parent | 70d1caf0ad967030b2ce835dc0f116ed1733c82c (diff) | |
| download | FreeBSD-src-ed209f46dbcc4a79d277e0d2e93dc51a1f331be5.zip FreeBSD-src-ed209f46dbcc4a79d277e0d2e93dc51a1f331be5.tar.gz | |
Revert "Proposed fix for CVE-2018-8897"
This reverts commit 70d1caf0ad967030b2ce835dc0f116ed1733c82c.
Diffstat (limited to 'sys/amd64/amd64/mp_machdep.c')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 34a05e9..450d512 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -87,7 +87,6 @@ extern struct pcpu __pcpu[]; char *doublefault_stack; char *mce_stack; char *nmi_stack; -char *dbg_stack; /* * Local data and functions. @@ -226,10 +225,6 @@ init_secondary(void) np = ((struct nmi_pcpu *) &mce_stack[PAGE_SIZE]) - 1; common_tss[cpu].tss_ist3 = (long) np; - /* The DB# stack runs on IST4. */ - np = ((struct nmi_pcpu *) &dbg_stack[PAGE_SIZE]) - 1; - common_tss[cpu].tss_ist4 = (long) np; - /* Prepare private GDT */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; for (x = 0; x < NGDT; x++) { @@ -275,10 +270,6 @@ init_secondary(void) np = ((struct nmi_pcpu *) &mce_stack[PAGE_SIZE]) - 1; np->np_pcpu = (register_t) pc; - /* Save the per-cpu pointer for use by the DB# handler. */ - np = ((struct nmi_pcpu *) &dbg_stack[PAGE_SIZE]) - 1; - np->np_pcpu = (register_t) pc; - wrmsr(MSR_FSBASE, 0); /* User value */ wrmsr(MSR_GSBASE, (u_int64_t)pc); wrmsr(MSR_KGSBASE, (u_int64_t)pc); /* XXX User value while we're in the kernel */ @@ -377,8 +368,6 @@ native_start_all_aps(void) M_WAITOK | M_ZERO); nmi_stack = (char *)kmem_malloc(kernel_arena, PAGE_SIZE, M_WAITOK | M_ZERO); - dbg_stack = (char *)kmem_malloc(kernel_arena, PAGE_SIZE, - M_WAITOK | M_ZERO); dpcpu = (void *)kmem_malloc(kernel_arena, DPCPU_SIZE, M_WAITOK | M_ZERO); |
