From nobody Mon Feb 9 08:12:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568280843; cv=none; d=zoho.com; s=zohoarc; b=UHrOsIBXeWUk+jle50oaq1d6AQvm3BeLF60nhrJFOMJok4uGXP3xpAMAMxKR0UDkF56q1xwpJ1Q3mr9XYAuTV1TeYka9y7wUj49e2C82uoYzeGvkkVMVu/Z2+ESCvkLQrluU0ad7N32nUXeaDXnBrnV6Rg+80b38as+2VYbJ1jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568280843; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8DX+X7/lSXQ3GCt32L4fWXJnTfWbeSBOaN7/zGKFQfs=; b=A28esx8QyGyDUiy/w9sZCJGKshnuLZQVk3Wev79t64Diz+NSf1c8f0TfVSFrpqz4dQHDjP6ZdnDq21fx4Kxm0XhtNGk3D8zJT1w/8V03brq9UovXoNkzKAUd1oexLK0zLIQT0ExeQrVx6InHq1iquMcsBzTThax4qeExbxcHf3w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568280843090527.1339021288992; Thu, 12 Sep 2019 02:34:03 -0700 (PDT) Received: from localhost ([::1]:59806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8LUD-0001Ht-D9 for importer@patchew.org; Thu, 12 Sep 2019 05:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42502) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8LEW-00021C-3a for qemu-devel@nongnu.org; Thu, 12 Sep 2019 05:17:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8LEU-0005ql-Su for qemu-devel@nongnu.org; Thu, 12 Sep 2019 05:17:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8LES-0005my-09; Thu, 12 Sep 2019 05:17:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57E4C3082128; Thu, 12 Sep 2019 09:17:39 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id E162B194B9; Thu, 12 Sep 2019 09:17:35 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 12:17:05 +0300 Message-Id: <20190912091710.21449-8-mlevitsk@redhat.com> In-Reply-To: <20190912091710.21449-1-mlevitsk@redhat.com> References: <20190912091710.21449-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 12 Sep 2019 09:17:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, John Snow , Markus Armbruster , Max Reitz , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" These values are not used by generic crypto code anyway Signed-off-by: Maxim Levitsky --- crypto/block-luks.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index f3bfc921b2..ba63e9b442 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -675,13 +675,13 @@ qcrypto_block_luks_open(QCryptoBlock *block, if (memcmp(luks->header.magic, qcrypto_block_luks_magic, QCRYPTO_BLOCK_LUKS_MAGIC_LEN) !=3D 0) { error_setg(errp, "Volume is not in LUKS format"); - ret =3D -EINVAL; + ret =3D -1; goto fail; } if (luks->header.version !=3D QCRYPTO_BLOCK_LUKS_VERSION) { error_setg(errp, "LUKS version %" PRIu32 " is not supported", luks->header.version); - ret =3D -ENOTSUP; + ret =3D -1; goto fail; } =20 @@ -697,7 +697,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, */ ivgen_name =3D strchr(cipher_mode, '-'); if (!ivgen_name) { - ret =3D -EINVAL; + ret =3D -1; error_setg(errp, "Unexpected cipher mode string format %s", cipher_mode); goto fail; @@ -715,7 +715,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->ivgen_hash_alg =3D qcrypto_block_luks_hash_name_lookup(ivhas= h_name, &local_= err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } @@ -724,7 +724,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->cipher_mode =3D qcrypto_block_luks_cipher_mode_lookup(cipher_mod= e, &local_err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } @@ -735,7 +735,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->header.master_key_len, &local_err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } @@ -744,7 +744,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, qcrypto_block_luks_hash_name_lookup(luks->header.hash_spec, &local_err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } @@ -752,14 +752,14 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->ivgen_alg =3D qcrypto_block_luks_ivgen_name_lookup(ivgen_name, &local_err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } =20 if (luks->ivgen_alg =3D=3D QCRYPTO_IVGEN_ALG_ESSIV) { if (!ivhash_name) { - ret =3D -EINVAL; + ret =3D -1; error_setg(errp, "Missing IV generator hash specification"); goto fail; } @@ -768,7 +768,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->ivgen_hash_alg, &local_err); if (local_err) { - ret =3D -ENOTSUP; + ret =3D -1; error_propagate(errp, local_err); goto fail; } @@ -795,7 +795,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, masterkey, readfunc, opaque, errp) < 0) { - ret =3D -EACCES; + ret =3D -1; goto fail; } =20 @@ -813,7 +813,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, luks->header.master_key_len, errp); if (!block->ivgen) { - ret =3D -ENOTSUP; + ret =3D -1; goto fail; } =20 @@ -825,7 +825,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, n_threads, errp); if (ret < 0) { - ret =3D -ENOTSUP; + ret =3D -1; goto fail; } } --=20 2.17.2