From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 318C96933C for ; Thu, 11 Feb 2021 19:20:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F9CA1F808 for ; Thu, 11 Feb 2021 19:20:01 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0BDFF1F7FD for ; Thu, 11 Feb 2021 19:20:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CCBD54415E for ; Thu, 11 Feb 2021 19:19:59 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 11 Feb 2021 19:19:47 +0100 Message-Id: <20210211181947.11368-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common] fix #3259: always free certificate file after reading it X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 18:20:01 -0000 This commit mirrors e3c4007bc94956962c03da8c6853415d2fdf057c in pve-cluster. The fix there got lost with a refactoring for reusing the code here in pve-common in c92b771669e68a8b49906b8a0a68b533750567b0 Tested by repeadetly reading https://$pve-node:8006/nodes on a virtual testcluster. Signed-off-by: Stoiko Ivanov --- src/PVE/Certificate.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm index 5bc9848..31a7722 100644 --- a/src/PVE/Certificate.pm +++ b/src/PVE/Certificate.pm @@ -199,10 +199,8 @@ my $read_certificate = sub { or $ssl_die->("unable to read '$cert_path' - $!\n"); my $cert = Net::SSLeay::PEM_read_bio_X509($bio); - if (!$cert) { - Net::SSLeay::BIO_free($bio); - die "unable to read certificate from '$cert_path'\n"; - } + Net::SSLeay::BIO_free($bio); + die "unable to read certificate from '$cert_path'\n" if !$cert; return $cert; }; -- 2.20.1