From nobody Wed Nov 27 12:39:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699384178; cv=none; d=zohomail.com; s=zohoarc; b=fGIj18tH5fD0BheTKDHaH0Vnsr7u/PGlS/EmE7Vlu5JQpZe+ZwYn+DNTDW2G0kpjBIBGIKRb8iRPBWDS9T5GbT2kS5je3bQvDPwRRv83HLJdCW+SGpc+6qFhcYFU5o+UpkBMDT1cb0r7XsltomZe5SeCm2zSzPUZb8buum22a0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699384178; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=e/CluFChsbBL3IuPKXEGp9v93+bN93D23x2uQhxilqA=; b=hHKBrRa/I3Cy1HxUXzlcR63lEEVOUSrmPQab/swnBeuc9KGyYzmZeWsDm/3vl4YHzeoLk/3KTyw404m5/RbXFqovgUkwrHD1OjTE2w6PG6MZYS1XPkiSfvirvrQfPVgInZVLTJRpwFe8hw6BTKlwwrPgsmeHCgDAlDsQl6BYRu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699384178713945.707661120661; Tue, 7 Nov 2023 11:09:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0RR6-0004WE-I4; Tue, 07 Nov 2023 14:08:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0RR4-0004Vq-4L for qemu-devel@nongnu.org; Tue, 07 Nov 2023 14:08:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0RR2-0005oh-IG for qemu-devel@nongnu.org; Tue, 07 Nov 2023 14:08:25 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-601-pTCbF33cP-6s5e-gBPWbiw-1; Tue, 07 Nov 2023 14:08:20 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3626185A781 for ; Tue, 7 Nov 2023 19:08:19 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0C6D25C0; Tue, 7 Nov 2023 19:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699384103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e/CluFChsbBL3IuPKXEGp9v93+bN93D23x2uQhxilqA=; b=cvPyINxnIvSrKLQ7celc3HAQwX6sFMEbxkgXM26Mc3H/Vjw+PPDt54kX31gYb5eWjq4QWc vs/VV9HEjq1ATHfTmCL4gjIwOM6t5yrZ2bKkT61ZZxBPafoqX5KGJUrmvsz1O6k8mTSP7l tAtpOYUHmNVHl68lEcwYIv3F9dod0hs= X-MC-Unique: pTCbF33cP-6s5e-gBPWbiw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Subject: [PULL 1/5] crypto/rsakey-builtin.c.inc: Clean up two error paths Date: Tue, 7 Nov 2023 19:08:13 +0000 Message-ID: <20231107190817.1607710-2-berrange@redhat.com> In-Reply-To: <20231107190817.1607710-1-berrange@redhat.com> References: <20231107190817.1607710-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1699384179569100001 From: Markus Armbruster When qcrypto_builtin_rsa_public_key_parse() is about to fail, but no error has been set, it makes one up. Actually, there's just one way to fail without setting an error. Set it there instead. Same for qcrypto_builtin_rsa_private_key_parse(). Signed-off-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/rsakey-builtin.c.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/crypto/rsakey-builtin.c.inc b/crypto/rsakey-builtin.c.inc index aeeacc8f9b..46cc7afe87 100644 --- a/crypto/rsakey-builtin.c.inc +++ b/crypto/rsakey-builtin.c.inc @@ -88,15 +88,13 @@ static QCryptoAkCipherRSAKey *qcrypto_builtin_rsa_publi= c_key_parse( goto error; } if (seq_length !=3D 0) { + error_setg(errp, "Invalid RSA public key"); goto error; } =20 return rsa; =20 error: - if (errp && !*errp) { - error_setg(errp, "Invalid RSA public key"); - } qcrypto_akcipher_rsakey_free(rsa); return NULL; } @@ -169,15 +167,13 @@ static QCryptoAkCipherRSAKey *qcrypto_builtin_rsa_pri= vate_key_parse( return rsa; } if (seq_length !=3D 0) { + error_setg(errp, "Invalid RSA private key"); goto error; } =20 return rsa; =20 error: - if (errp && !*errp) { - error_setg(errp, "Invalid RSA private key"); - } qcrypto_akcipher_rsakey_free(rsa); return NULL; } --=20 2.41.0