Author: gordon
Date: Wed Nov 15 22:39:41 2017
New Revision: 325868
URL: https://svnweb.freebsd.org/changeset/base/325868

Log:
  Fix kernel data leak via ptrace(PT_LWPINFO). [SA-17:08]
  
  Approved by:  so
  Security:     FreeBSD-SA-17:08.ptrace
  Security:     CVE-2017-1086

Modified:
  releng/11.1/sys/kern/sys_process.c

Modified: releng/11.1/sys/kern/sys_process.c
==============================================================================
--- releng/11.1/sys/kern/sys_process.c  Wed Nov 15 22:35:16 2017        
(r325867)
+++ releng/11.1/sys/kern/sys_process.c  Wed Nov 15 22:39:41 2017        
(r325868)
@@ -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, voi
                } 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, voi
                                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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to