diff options
| -rw-r--r-- | sys/i386/i386/sys_machdep.c | 8 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 10 | ||||
| -rw-r--r-- | sys/i386/include/proc.h | 1 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 5d53aa8b73ea..aa4f92a8f7fa 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -449,6 +449,14 @@ user_ldt_free(struct thread *td) } mdp->md_ldt = NULL; + user_ldt_deref(pldt); +} + +void +user_ldt_deref(struct proc_ldt *pldt) +{ + + mtx_assert(&dt_lock, MA_OWNED); if (--pldt->ldt_refcnt == 0) { mtx_unlock_spin(&dt_lock); kmem_free(kernel_map, (vm_offset_t)pldt->ldt_base, diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 57a47393b0a6..963df09f4b5c 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -156,17 +156,17 @@ cpu_fork(td1, p2, td2, flags) if ((flags & RFMEM) == 0) { /* unshare user LDT */ struct mdproc *mdp1 = &p1->p_md; - struct proc_ldt *pldt; + struct proc_ldt *pldt, *pldt1; mtx_lock_spin(&dt_lock); - if ((pldt = mdp1->md_ldt) != NULL && - pldt->ldt_refcnt > 1) { - pldt = user_ldt_alloc(mdp1, pldt->ldt_len); + if ((pldt1 = mdp1->md_ldt) != NULL && + pldt1->ldt_refcnt > 1) { + pldt = user_ldt_alloc(mdp1, pldt1->ldt_len); if (pldt == NULL) panic("could not copy LDT"); mdp1->md_ldt = pldt; set_user_ldt(mdp1); - user_ldt_free(td1); + user_ldt_deref(pldt1); } else mtx_unlock_spin(&dt_lock); } diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h index d33f7be65296..1e0b9f9db10a 100644 --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -71,6 +71,7 @@ struct mdproc { void set_user_ldt(struct mdproc *); struct proc_ldt *user_ldt_alloc(struct mdproc *, int); void user_ldt_free(struct thread *); +void user_ldt_deref(struct proc_ldt *pldt); extern struct mtx dt_lock; |