From 9f33a6dcb47ef513275dcaa7b749d8ffd596470e Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 20 Aug 2021 10:41:41 +0200
Subject: [PATCH] virsocket: Don't preserve errno in virSocketRecvFD()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When setting O_CLOEXEC flag on received FD fails the FD is closed
using VIR_FORCE_CLOSE(). But the call is wrapped in errno save
which is not necessary because VIR_FORCE_CLOSE() preserves  errno
value.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/virsocket.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/util/virsocket.c b/src/util/virsocket.c
index b971da16e3..a6f185114d 100644
--- a/src/util/virsocket.c
+++ b/src/util/virsocket.c
@@ -477,9 +477,7 @@ virSocketRecvFD(int sock, int fdflags)
     /* set close-on-exec flag */
     if (!MSG_CMSG_CLOEXEC && (fdflags & O_CLOEXEC)) {
         if (virSetCloseExec(fd) < 0) {
-            int saved_errno = errno;
             VIR_FORCE_CLOSE(fd);
-            errno = saved_errno;
             return -1;
         }
     }