Module Name: src Committed By: martin Date: Thu Nov 29 08:51:01 UTC 2018
Modified Files: src/sys/arch/amd64/amd64 [netbsd-8]: machdep.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1111): sys/arch/amd64/amd64/machdep.c: revision 1.321 Fix stack info leak. There is a big padding in struct sigframe_siginfo. [ 224.006287] kleak: Possible leak in copyout: [len=920, leaked=92] [ 224.016977] #0 0xffffffff80224d0a in kleak_note <netbsd> [ 224.026268] #1 0xffffffff80224d8a in kleak_copyout <netbsd> [ 224.026268] #2 0xffffffff802224b5 in sendsig_siginfo <netbsd> [ 224.036261] #3 0xffffffff80b51564 in sendsig <netbsd> [ 224.046475] #4 0xffffffff80b51282 in postsig <netbsd> [ 224.046475] #5 0xffffffff80b2fc5d in lwp_userret <netbsd> [ 224.056273] #6 0xffffffff8025a951 in mi_userret <netbsd> [ 224.066277] #7 0xffffffff8025ab89 in syscall <netbsd> To generate a diff of this commit: cvs rdiff -u -r1.255.6.7 -r1.255.6.8 src/sys/arch/amd64/amd64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.255.6.7 src/sys/arch/amd64/amd64/machdep.c:1.255.6.8 --- src/sys/arch/amd64/amd64/machdep.c:1.255.6.7 Sat Jun 9 15:12:21 2018 +++ src/sys/arch/amd64/amd64/machdep.c Thu Nov 29 08:51:01 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.255.6.7 2018/06/09 15:12:21 martin Exp $ */ +/* $NetBSD: machdep.c,v 1.255.6.8 2018/11/29 08:51:01 martin Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255.6.7 2018/06/09 15:12:21 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255.6.8 2018/11/29 08:51:01 martin Exp $"); /* #define XENDEBUG_LOW */ @@ -606,6 +606,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c /* Round down the stackpointer to a multiple of 16 for the ABI. */ fp = (struct sigframe_siginfo *)(((unsigned long)sp & ~15) - 8); + memset(&frame, 0, sizeof(frame)); frame.sf_ra = (uint64_t)ps->sa_sigdesc[sig].sd_tramp; frame.sf_si._info = ksi->ksi_info; frame.sf_uc.uc_flags = _UC_SIGMASK; @@ -613,7 +614,6 @@ sendsig_siginfo(const ksiginfo_t *ksi, c frame.sf_uc.uc_link = l->l_ctxlink; frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK) ? _UC_SETSTACK : _UC_CLRSTACK; - memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack)); sendsig_reset(l, sig); mutex_exit(p->p_lock);