diff options
| author | gordon <gordon@FreeBSD.org> | 2017-11-15 22:39:41 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2017-11-15 22:39:41 +0000 |
| commit | 7bfcc0bdc10f78c17fe931789b415e0d95b7bdf7 (patch) | |
| tree | 74b0b5b70985b03f9cddf780d5e6f6a8654c9968 | |
| parent | eb519e5c3cd4ca13794cb43d3b37ae52c0f86cdf (diff) | |
| download | FreeBSD-src-7bfcc0bdc10f78c17fe931789b415e0d95b7bdf7.zip FreeBSD-src-7bfcc0bdc10f78c17fe931789b415e0d95b7bdf7.tar.gz | |
Fix kernel data leak via ptrace(PT_LWPINFO). [SA-17:08]
Approved by: so
Security: FreeBSD-SA-17:08.ptrace
Security: CVE-2017-1086
| -rw-r--r-- | sys/kern/sys_process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index ded874a..a8513c9 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -518,6 +518,7 @@ ptrace_lwpinfo_to32(const struct ptrace_lwpinfo *pl, struct ptrace_lwpinfo32 *pl32) { + bzero(pl32, sizeof(*pl32)); pl32->pl_lwpid = pl->pl_lwpid; pl32->pl_event = pl->pl_event; pl32->pl_flags = pl->pl_flags; @@ -1301,6 +1302,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) } else #endif pl = addr; + bzero(pl, sizeof(*pl)); pl->pl_lwpid = td2->td_tid; pl->pl_event = PL_EVENT_NONE; pl->pl_flags = 0; @@ -1321,8 +1323,6 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) pl->pl_siginfo = td2->td_dbgksi.ksi_info; } } - if ((pl->pl_flags & PL_FLAG_SI) == 0) - bzero(&pl->pl_siginfo, sizeof(pl->pl_siginfo)); if (td2->td_dbgflags & TDB_SCE) pl->pl_flags |= PL_FLAG_SCE; else if (td2->td_dbgflags & TDB_SCX) |
