From owner-svn-src-all@freebsd.org  Mon Aug 21 17:40:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E7F6DEA515;
 Mon, 21 Aug 2017 17:40:52 +0000 (UTC)
 (envelope-from glebius@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 mx1.freebsd.org (Postfix) with ESMTPS id 6D8DE7D398;
 Mon, 21 Aug 2017 17:40:52 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7LHepo2024660;
 Mon, 21 Aug 2017 17:40:51 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7LHepx1024659;
 Mon, 21 Aug 2017 17:40:51 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201708211740.v7LHepx1024659@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 21 Aug 2017 17:40:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r322764 - stable/11/sys/kern
X-SVN-Group: stable-11
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: stable/11/sys/kern
X-SVN-Commit-Revision: 322764
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Aug 2017 17:40:52 -0000

Author: glebius
Date: Mon Aug 21 17:40:51 2017
New Revision: 322764
URL: https://svnweb.freebsd.org/changeset/base/322764

Log:
  Merge r322321:
  
    Plug uninitialized stack variable leak in sendfile(2).
  
  Reported by:	Ilja Van Sprundel <ivansprundel ioactive.com>
  Submitted by:	Domagoj Stolfa <domagoj.stolfa gmail.com>
  Security:	uninitialized stack variable leak

Modified:
  stable/11/sys/kern/kern_sendfile.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_sendfile.c
==============================================================================
--- stable/11/sys/kern/kern_sendfile.c	Mon Aug 21 17:39:12 2017	(r322763)
+++ stable/11/sys/kern/kern_sendfile.c	Mon Aug 21 17:40:51 2017	(r322764)
@@ -930,6 +930,7 @@ sendfile(struct thread *td, struct sendfile_args *uap,
 	if (uap->offset < 0)
 		return (EINVAL);
 
+	sbytes = 0;
 	hdr_uio = trl_uio = NULL;
 
 	if (uap->hdtr != NULL) {