From nobody Sat May 4 08:43:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629449731; cv=none; d=zohomail.com; s=zohoarc; b=b7woE+zlwRFdYtF5jPUhwUPjbr6BPPsWwWAP0v1CQzix8p+rI2jJA8a5vRFNJPTUJg4GhFsWIyRK+NyH6DBQlaC7gwmNOEkXBSOi942Ll2XOvjf1+jhAfKGCCIsx8aGK0lnbiyYJaI647QY/QkdzUJqf+iY6XfTtnLI7WckL2S0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629449731; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5uJg51qC1SDEFIV1rBHqQsR1tsZB3mN3QDWIK9t6Bn4=; b=bP8OCw2AMqpFjyfnNcIOQ0yvSw0zjSlWL58KO5jJQzdYGB5ckqhKcfcdFLtVOq/Mm0Khb1LB7NEou/qOllPeg28hAlCjmsju/tUZ6lPkwKQAikdM4KkNKH6JPvHUEEv0k2SBiJDKDIk9JqpxDb1Zg22f9hYRJmH57fW2i3VtNgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162944973145838.61373616950573; Fri, 20 Aug 2021 01:55:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-k5veo8f9MoaTbYN9ZPdM6g-1; Fri, 20 Aug 2021 04:55:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA51A8799E0; Fri, 20 Aug 2021 08:55:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C1CE5C1BB; Fri, 20 Aug 2021 08:55:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D2E49181A0F8; Fri, 20 Aug 2021 08:55:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17K8tKHM024805 for ; Fri, 20 Aug 2021 04:55:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 29D491B42C; Fri, 20 Aug 2021 08:55:20 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8FDF1B400 for ; Fri, 20 Aug 2021 08:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629449730; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5uJg51qC1SDEFIV1rBHqQsR1tsZB3mN3QDWIK9t6Bn4=; b=JDannoRyGuviwkaMxeor3z+a4qsrQ0MlIe99xA6NYiaVzmqZcdxmvnjoQnP/S6gIr9HEd4 u/QcWSNih46A4z/eJuuUmBdzEDGjCf8qZeRHPQhThr15gYnoXk0HKjP1gCpWlKj56iYUqu VFyU+YdwzAt3mGDGMVJHlPhDaGEE6H4= X-MC-Unique: k5veo8f9MoaTbYN9ZPdM6g-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] virsocket: Don't preserve errno in virSocketRecvFD() Date: Fri, 20 Aug 2021 10:55:09 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629449732501100001 Content-Type: text/plain; charset="utf-8" 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() preservers errno value. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- 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 =3D errno; VIR_FORCE_CLOSE(fd); - errno =3D saved_errno; return -1; } } --=20 2.31.1