svn commit: r341146 - in stable/12/sys: amd64/ia32 mips/mips powerpc/powerpc

[Eric van Gyzen]

Author: vangyzen
Date: Wed Nov 28 15:31:05 2018
New Revision: 341146
URL: https://svnweb.freebsd.org/changeset/base/341146

Log:
  MFC r340994
  
  Prevent kernel stack disclosure in getcontext/swapcontext
  
  Expand r338982 to cover freebsd32 interfaces on amd64, mips, and powerpc.
  
  Security:	FreeBSD-EN-18:12.mem
  Security:	CVE-2018-17155
  Sponsored by:	Dell EMC Isilon

Modified:
  stable/12/sys/amd64/ia32/ia32_signal.c
  stable/12/sys/mips/mips/freebsd32_machdep.c
  stable/12/sys/powerpc/powerpc/exec_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/ia32/ia32_signal.c
==============================================================================
--- stable/12/sys/amd64/ia32/ia32_signal.c	Wed Nov 28 15:29:58 2018	(r341145)
+++ stable/12/sys/amd64/ia32/ia32_signal.c	Wed Nov 28 15:31:05 2018	(r341146)
@@ -261,6 +261,7 @@ freebsd32_getcontext(struct thread *td, struct freebsd
 	if (uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		ia32_get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;
@@ -301,6 +302,7 @@ freebsd32_swapcontext(struct thread *td, struct freebs
 	if (uap->oucp == NULL || uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		ia32_get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;

Modified: stable/12/sys/mips/mips/freebsd32_machdep.c
==============================================================================
--- stable/12/sys/mips/mips/freebsd32_machdep.c	Wed Nov 28 15:29:58 2018	(r341145)
+++ stable/12/sys/mips/mips/freebsd32_machdep.c	Wed Nov 28 15:31:05 2018	(r341146)
@@ -294,6 +294,7 @@ freebsd32_getcontext(struct thread *td, struct freebsd
 	if (uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		get_mcontext32(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;
@@ -333,6 +334,7 @@ freebsd32_swapcontext(struct thread *td, struct freebs
 	if (uap->oucp == NULL || uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		get_mcontext32(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;

Modified: stable/12/sys/powerpc/powerpc/exec_machdep.c
==============================================================================
--- stable/12/sys/powerpc/powerpc/exec_machdep.c	Wed Nov 28 15:29:58 2018	(r341145)
+++ stable/12/sys/powerpc/powerpc/exec_machdep.c	Wed Nov 28 15:31:05 2018	(r341146)
@@ -783,6 +783,7 @@ freebsd32_getcontext(struct thread *td, struct freebsd
 	if (uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		get_mcontext32(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;
@@ -822,6 +823,7 @@ freebsd32_swapcontext(struct thread *td, struct freebs
 	if (uap->oucp == NULL || uap->ucp == NULL)
 		ret = EINVAL;
 	else {
+		bzero(&uc, sizeof(uc));
 		get_mcontext32(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
 		PROC_LOCK(td->td_proc);
 		uc.uc_sigmask = td->td_sigmask;