e6520ef815
Fix sendmail improper close-on-exec flag handling. [SA-14:11] Fix ktrace memory disclosure. [SA-14:12] Fix incorrect error handling in PAM policy parser. [SA-14:13] Fix triple-fault when executing from a threaded process. [EN-14:06]
66 lines
2 KiB
Diff
66 lines
2 KiB
Diff
Index: sys/kern/kern_exec.c
|
|
===================================================================
|
|
--- sys/kern/kern_exec.c (revision 266979)
|
|
+++ sys/kern/kern_exec.c (working copy)
|
|
@@ -278,6 +278,7 @@ kern_execve(td, args, mac_p)
|
|
struct mac *mac_p;
|
|
{
|
|
struct proc *p = td->td_proc;
|
|
+ struct vmspace *oldvmspace;
|
|
int error;
|
|
|
|
AUDIT_ARG_ARGV(args->begin_argv, args->argc,
|
|
@@ -294,6 +295,8 @@ kern_execve(td, args, mac_p)
|
|
PROC_UNLOCK(p);
|
|
}
|
|
|
|
+ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve"));
|
|
+ oldvmspace = td->td_proc->p_vmspace;
|
|
error = do_execve(td, args, mac_p);
|
|
|
|
if (p->p_flag & P_HADTHREADS) {
|
|
@@ -308,6 +311,12 @@ kern_execve(td, args, mac_p)
|
|
thread_single_end();
|
|
PROC_UNLOCK(p);
|
|
}
|
|
+ if ((td->td_pflags & TDP_EXECVMSPC) != 0) {
|
|
+ KASSERT(td->td_proc->p_vmspace != oldvmspace,
|
|
+ ("oldvmspace still used"));
|
|
+ vmspace_free(oldvmspace);
|
|
+ td->td_pflags &= ~TDP_EXECVMSPC;
|
|
+ }
|
|
|
|
return (error);
|
|
}
|
|
Index: sys/sys/proc.h
|
|
===================================================================
|
|
--- sys/sys/proc.h (revision 266979)
|
|
+++ sys/sys/proc.h (working copy)
|
|
@@ -938,4 +938,5 @@ curthread_pflags_restore(int save)
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
+#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */
|
|
#endif /* !_SYS_PROC_H_ */
|
|
Index: sys/vm/vm_map.c
|
|
===================================================================
|
|
--- sys/vm/vm_map.c (revision 266979)
|
|
+++ sys/vm/vm_map.c (working copy)
|
|
@@ -3521,6 +3521,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
|
|
struct vmspace *oldvmspace = p->p_vmspace;
|
|
struct vmspace *newvmspace;
|
|
|
|
+ KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0,
|
|
+ ("vmspace_exec recursed"));
|
|
newvmspace = vmspace_alloc(minuser, maxuser);
|
|
if (newvmspace == NULL)
|
|
return (ENOMEM);
|
|
@@ -3537,7 +3539,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
|
|
PROC_VMSPACE_UNLOCK(p);
|
|
if (p == curthread->td_proc)
|
|
pmap_activate(curthread);
|
|
- vmspace_free(oldvmspace);
|
|
+ curthread->td_pflags |= TDP_EXECVMSPC;
|
|
return (0);
|
|
}
|
|
|