From eb91e3e32ca3882647a31af165bcee18354360fd Mon Sep 17 00:00:00 2001 From: gordon Date: Wed, 15 Nov 2017 22:40:46 +0000 Subject: [PATCH] Fix kernel data leak via ptrace(PT_LWPINFO). [SA-17:08] Approved by: so Security: FreeBSD-SA-17:08.ptrace Security: CVE-2017-1086 git-svn-id: svn://svn.freebsd.org/base/releng/10.3@325871 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/kern/sys_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index bbfe321d8..418a6488e 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -474,6 +474,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; @@ -1193,6 +1194,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; @@ -1213,8 +1215,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) -- 2.42.0