From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz4xi-0005Qr-EJ for qemu-devel@nongnu.org; Wed, 18 Nov 2015 10:48:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz4xc-0001Z3-Jw for qemu-devel@nongnu.org; Wed, 18 Nov 2015 10:47:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz4xc-0001Yw-Ea for qemu-devel@nongnu.org; Wed, 18 Nov 2015 10:47:52 -0500 From: "Daniel P. Berrange" Date: Wed, 18 Nov 2015 15:47:42 +0000 Message-Id: <1447861664-16283-3-git-send-email-berrange@redhat.com> In-Reply-To: <1447861664-16283-1-git-send-email-berrange@redhat.com> References: <1447861664-16283-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 (for 2.5) 2/4] crypto: fix mistaken setting of Error in success code path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell The qcrypto_tls_session_check_certificate() method was setting an Error even when the ACL check suceeded. This didn't affect the callers detection of errors because they relied on the function return status, but this did cause a memory leak since the caller would not free an Error they did not expect to be set. Signed-off-by: Daniel P. Berrange --- crypto/tlssession.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/tlssession.c b/crypto/tlssession.c index ffc5c47..3735529 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -304,9 +304,9 @@ qcrypto_tls_session_check_certificate(QCryptoTLSSession *session, allow = qemu_acl_party_is_allowed(acl, session->peername); - error_setg(errp, "TLS x509 ACL check for %s is %s", - session->peername, allow ? "allowed" : "denied"); if (!allow) { + error_setg(errp, "TLS x509 ACL check for %s is denied", + session->peername); goto error; } } -- 2.5.0