diff options
| author | Eric van Gyzen <vangyzen@FreeBSD.org> | 2018-11-26 20:50:55 +0000 |
|---|---|---|
| committer | Eric van Gyzen <vangyzen@FreeBSD.org> | 2018-11-26 20:50:55 +0000 |
| commit | f5e7d8bdb51ec52b3530c85f42bb7aff8a495330 (patch) | |
| tree | 9fb2d78ccfe1ed91229eb231320b9ce45fa13905 /sys/amd64/ia32 | |
| parent | ec60b7f9297c8074229821fd9035664f0c7e3f6e (diff) | |
| download | src-f5e7d8bdb51ec52b3530c85f42bb7aff8a495330.tar.gz src-f5e7d8bdb51ec52b3530c85f42bb7aff8a495330.zip | |
Prevent kernel stack disclosure in getcontext/swapcontext
Expand r338982 to cover freebsd32 interfaces on amd64, mips, and powerpc.
MFC after: 2 days
Security: FreeBSD-EN-18:12.mem
Security: CVE-2018-17155
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=340994
Diffstat (limited to 'sys/amd64/ia32')
| -rw-r--r-- | sys/amd64/ia32/ia32_signal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c index f0ed9bd3eb0c..72f35af75b85 100644 --- a/sys/amd64/ia32/ia32_signal.c +++ b/sys/amd64/ia32/ia32_signal.c @@ -261,6 +261,7 @@ freebsd32_getcontext(struct thread *td, struct freebsd32_getcontext_args *uap) 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 freebsd32_swapcontext_args *uap) 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; |