From owner-svn-src-all@freebsd.org Tue Jan 28 18:57:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E5B5237ECD; Tue, 28 Jan 2020 18:57:46 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486bTj6gvHz4Ntm; Tue, 28 Jan 2020 18:57:45 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0912278C4; Tue, 28 Jan 2020 18:57:45 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00SIvj4n038020; Tue, 28 Jan 2020 18:57:45 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00SIvjeF038017; Tue, 28 Jan 2020 18:57:45 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202001281857.00SIvjeF038017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 28 Jan 2020 18:57:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r357219 - in releng: 11.3/sys/kern 12.0/sys/kern 12.1/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/kern 12.0/sys/kern 12.1/sys/kern X-SVN-Commit-Revision: 357219 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2020 18:57:46 -0000 Author: gordon Date: Tue Jan 28 18:57:45 2020 New Revision: 357219 URL: https://svnweb.freebsd.org/changeset/base/357219 Log: Fix kernel stack data disclosure Reported by: Ilja Van Sprundel Approved by: so Security: FreeBSD-SA-20:03.thrmisc Security: CVE-2019-15875 Modified: releng/11.3/sys/kern/imgact_elf.c releng/12.0/sys/kern/imgact_elf.c releng/12.1/sys/kern/imgact_elf.c Modified: releng/11.3/sys/kern/imgact_elf.c ============================================================================== --- releng/11.3/sys/kern/imgact_elf.c Tue Jan 28 18:56:46 2020 (r357218) +++ releng/11.3/sys/kern/imgact_elf.c Tue Jan 28 18:57:45 2020 (r357219) @@ -2007,7 +2007,7 @@ __elfN(note_thrmisc)(void *arg, struct sbuf *sb, size_ td = (struct thread *)arg; if (sb != NULL) { KASSERT(*sizep == sizeof(thrmisc), ("invalid size")); - bzero(&thrmisc._pad, sizeof(thrmisc._pad)); + bzero(&thrmisc, sizeof(thrmisc)); strcpy(thrmisc.pr_tname, td->td_name); sbuf_bcat(sb, &thrmisc, sizeof(thrmisc)); } Modified: releng/12.0/sys/kern/imgact_elf.c ============================================================================== --- releng/12.0/sys/kern/imgact_elf.c Tue Jan 28 18:56:46 2020 (r357218) +++ releng/12.0/sys/kern/imgact_elf.c Tue Jan 28 18:57:45 2020 (r357219) @@ -2022,7 +2022,7 @@ __elfN(note_thrmisc)(void *arg, struct sbuf *sb, size_ td = (struct thread *)arg; if (sb != NULL) { KASSERT(*sizep == sizeof(thrmisc), ("invalid size")); - bzero(&thrmisc._pad, sizeof(thrmisc._pad)); + bzero(&thrmisc, sizeof(thrmisc)); strcpy(thrmisc.pr_tname, td->td_name); sbuf_bcat(sb, &thrmisc, sizeof(thrmisc)); } Modified: releng/12.1/sys/kern/imgact_elf.c ============================================================================== --- releng/12.1/sys/kern/imgact_elf.c Tue Jan 28 18:56:46 2020 (r357218) +++ releng/12.1/sys/kern/imgact_elf.c Tue Jan 28 18:57:45 2020 (r357219) @@ -2211,7 +2211,7 @@ __elfN(note_thrmisc)(void *arg, struct sbuf *sb, size_ td = (struct thread *)arg; if (sb != NULL) { KASSERT(*sizep == sizeof(thrmisc), ("invalid size")); - bzero(&thrmisc._pad, sizeof(thrmisc._pad)); + bzero(&thrmisc, sizeof(thrmisc)); strcpy(thrmisc.pr_tname, td->td_name); sbuf_bcat(sb, &thrmisc, sizeof(thrmisc)); }