Save errno from close override.

Approved by:	pjd (mentor)

2 files changed, 7 insertions, 1 deletions

diff --git a/sys/kern/subr_nvlist.c b/sys/kern/subr_nvlist.c
index 5cdf45b..746514b 100644
--- a/sys/kern/subr_nvlist.c
+++ b/sys/kern/subr_nvlist.c
@@ -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;
 	}
 
diff --git a/sys/kern/subr_nvpair.c b/sys/kern/subr_nvpair.c
index 2e11d799..1fe8806 100644
--- a/sys/kern/subr_nvpair.c
+++ b/sys/kern/subr_nvpair.c
@@ -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 *name, int value)
 
 	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);
 }