[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes fr
From: |
Daniel P . Berrangé |
Subject: |
Re: [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback |
Date: |
Tue, 17 Sep 2019 11:01:39 +0100 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Thu, Sep 12, 2019 at 12:17:05PM +0300, Maxim Levitsky wrote:
> These values are not used by generic crypto code anyway
>
> Signed-off-by: Maxim Levitsky <address@hidden>
> ---
> 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) != 0) {
> error_setg(errp, "Volume is not in LUKS format");
> - ret = -EINVAL;
> + ret = -1;
> goto fail;
> }
The 'ret' variable should be just deleted entirely, so the
'fail:' block can directly 'return -1'.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
- [Qemu-block] [PATCH 00/12] crypto/luks: preparation for encryption key managment, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 01/12] block-crypto: misc refactoring, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 02/12] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 03/12] qcrypto-luks: don't overwrite cipher_mode in header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 05/12] qcrypto-luks: pass keyslot index rather that pointer to the keyslot, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 04/12] qcrypto-luks: simplify masterkey and masterkey length, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 06/12] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback, Maxim Levitsky, 2019/09/12
- Re: [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback,
Daniel P . Berrangé <=
- [Qemu-block] [PATCH 08/12] qcrypto-luks: extract store and load header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 09/12] qcrypto-luks: extract check and parse header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 10/12] qcrypto-luks: extract store key function, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 11/12] qcrypto-luks: simplify the math used for keyslot locations, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 12/12] qcrypto-luks: more rigorous header checking, Maxim Levitsky, 2019/09/12