From owner-svn-src-stable@freebsd.org  Thu Sep 17 18:21:48 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 C19C69CEFDE;
 Thu, 17 Sep 2015 18:21:48 +0000 (UTC)
 (envelope-from rstone@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 AC43D17B9;
 Thu, 17 Sep 2015 18:21:48 +0000 (UTC)
 (envelope-from rstone@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HILmn8034334;
 Thu, 17 Sep 2015 18:21:48 GMT (envelope-from rstone@FreeBSD.org)
Received: (from rstone@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HILm7n034330;
 Thu, 17 Sep 2015 18:21:48 GMT (envelope-from rstone@FreeBSD.org)
Message-Id: <201509171821.t8HILm7n034330@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rstone set sender to
 rstone@FreeBSD.org using -f
From: Ryan Stone <rstone@FreeBSD.org>
Date: Thu, 17 Sep 2015 18:21:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r287929 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 18:21:48 -0000

Author: rstone
Date: Thu Sep 17 18:21:47 2015
New Revision: 287929
URL: https://svnweb.freebsd.org/changeset/base/287929

Log:
  MFC r279410:
  
    Correct the use of an unitialized variable in sendfind_getobj()
  
    When sendfile_getobj() is called on a DTYPE_SHM file, it never
    initializes error, which is eventually returned to the caller.

Modified:
  stable/10/sys/kern/uipc_syscalls.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/10/sys/kern/uipc_syscalls.c	Thu Sep 17 18:19:55 2015	(r287928)
+++ stable/10/sys/kern/uipc_syscalls.c	Thu Sep 17 18:21:47 2015	(r287929)
@@ -2114,6 +2114,7 @@ sendfile_getobj(struct thread *td, struc
 			goto out;
 		}
 	} else if (fp->f_type == DTYPE_SHM) {
+		error = 0;
 		shmfd = fp->f_data;
 		obj = shmfd->shm_object;
 		*obj_size = shmfd->shm_size;