Module Name: src Committed By: martin Date: Tue Feb 25 19:12:14 UTC 2020
Modified Files: src/sys/kern [netbsd-8]: uipc_socket.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1509): sys/kern/uipc_socket.c: revision 1.288 Zero out 'tv', to prevent uninitialized bytes in its padding from leaking to userland. Found by kMSan. To generate a diff of this commit: cvs rdiff -u -r1.255.2.4 -r1.255.2.5 src/sys/kern/uipc_socket.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/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.255.2.4 src/sys/kern/uipc_socket.c:1.255.2.5 --- src/sys/kern/uipc_socket.c:1.255.2.4 Mon Nov 12 09:43:19 2018 +++ src/sys/kern/uipc_socket.c Tue Feb 25 19:12:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.255.2.5 2020/02/25 19:12:14 martin Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.5 2020/02/25 19:12:14 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -2015,6 +2015,7 @@ sogetopt1(struct socket *so, struct sock optval = (opt == SO_SNDTIMEO ? so->so_snd.sb_timeo : so->so_rcv.sb_timeo); + memset(&tv, 0, sizeof(tv)); tv.tv_sec = optval / hz; tv.tv_usec = (optval % hz) * tick;