From owner-svn-src-head@FreeBSD.ORG  Wed Apr 29 22:59:45 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 25AB0E26;
 Wed, 29 Apr 2015 22:59:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 140651365;
 Wed, 29 Apr 2015 22:59:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TMxiNQ092302;
 Wed, 29 Apr 2015 22:59:44 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TMxiKJ092300;
 Wed, 29 Apr 2015 22:59:44 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201504292259.t3TMxiKJ092300@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Wed, 29 Apr 2015 22:59:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282258 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Apr 2015 22:59:45 -0000

Author: oshogbo
Date: Wed Apr 29 22:59:44 2015
New Revision: 282258
URL: https://svnweb.freebsd.org/changeset/base/282258

Log:
  Save errno from close override.
  
  Approved by:	pjd (mentor)

Modified:
  head/sys/kern/subr_nvlist.c
  head/sys/kern/subr_nvpair.c

Modified: head/sys/kern/subr_nvlist.c
==============================================================================
--- head/sys/kern/subr_nvlist.c	Wed Apr 29 22:57:04 2015	(r282257)
+++ head/sys/kern/subr_nvlist.c	Wed Apr 29 22:59:44 2015	(r282258)
@@ -929,8 +929,10 @@ nvlist_recv(int sock)
 
 	nvl = nvlist_xunpack(buf, size, fds, nfds);
 	if (nvl == NULL) {
+		SAVE_ERRNO(serrno);
 		for (i = 0; i < nfds; i++)
 			close(fds[i]);
+		RESTORE_ERRNO(serrno);
 		goto out;
 	}
 

Modified: head/sys/kern/subr_nvpair.c
==============================================================================
--- head/sys/kern/subr_nvpair.c	Wed Apr 29 22:57:04 2015	(r282257)
+++ head/sys/kern/subr_nvpair.c	Wed Apr 29 22:59:44 2015	(r282258)
@@ -848,6 +848,7 @@ nvpair_t *
 nvpair_create_descriptor(const char *name, int value)
 {
 	nvpair_t *nvp;
+	int serrno;
 
 	if (value < 0 || !fd_is_valid(value)) {
 		errno = EBADF;
@@ -860,8 +861,11 @@ nvpair_create_descriptor(const char *nam
 
 	nvp = nvpair_allocv(name, NV_TYPE_DESCRIPTOR, (uint64_t)value,
 	    sizeof(int64_t));
-	if (nvp == NULL)
+	if (nvp == NULL) {
+		SAVE_ERRNO(serrno);
 		close(value);
+		RESTORE_ERRNO(serrno);
+	}
 
 	return (nvp);
 }