crypto: two minor fixes
cover crypto: two minor fixes
Daniel P. Berrangé (2):
crypto: avoid leak of ctx when bad cipher mode is given
crypto: use consistent error reporting pattern for unsupported cipher
modes
crypto/cipher-nettle.c.inc | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
Signature · 1 line
2.45.1
PATCH 1/2 crypto: avoid leak of ctx when bad cipher mode is given
This fixes Coverity CID-1546884
--- crypto/cipher-nettle.c.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
crypto/cipher-nettle.c.inc +5 -2
@@ -734,16 +734,19 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg, #ifdef CONFIG_CRYPTO_SM4 case QCRYPTO_CIPHER_ALG_SM4: { - QCryptoNettleSm4 *ctx = g_new0(QCryptoNettleSm4, 1); + QCryptoNettleSm4 *ctx; + const QCryptoCipherDriver *drv; switch (mode) { case QCRYPTO_CIPHER_MODE_ECB: - ctx->base.driver = &qcrypto_nettle_sm4_driver_ecb; + drv = &qcrypto_nettle_sm4_driver_ecb; break; default: goto bad_cipher_mode; } + ctx = g_new0(QCryptoNettleSm4, 1); + ctx->base.driver = drv; sm4_set_encrypt_key(&ctx->key[0], key); sm4_set_decrypt_key(&ctx->key[1], key);
Signature · 1 line
2.45.1
Re: [PATCH 1/2] crypto: avoid leak of ctx when bad cipher mode is given
Quoted 4 lines · Daniel P. Berrangé
This fixes Coverity CID-1546884
Signed-off-by Daniel P. Berrangé <[email protected]>
thanks
-- PMM
Re: [PATCH 1/2] crypto: avoid leak of ctx when bad cipher mode is given
In reply to Daniel P. BerrangéQuoted 6 lines · Daniel P. Berrangé
This fixes Coverity CID-1546884
Signed-off-by Daniel P. Berrangé <[email protected]>--- crypto/cipher-nettle.c.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Re: [PATCH 1/2] crypto: avoid leak of ctx when bad cipher mode is given
In reply to Daniel P. BerrangéQuoted 1 line · Daniel P. Berrangé
This fixes Coverity CID-1546884
We usually say
Quoted 1 line
Signed-off-by Daniel P. Berrangé <[email protected]>
PATCH 2/2 crypto: use consistent error reporting pattern for unsupported cipher modes
In reply to Daniel P. BerrangéNot all paths in qcrypto_cipher_ctx_new() were correctly distinguishing between valid user input for cipher mode (which should report a user facing error), vs program logic errors (which should assert).
--- crypto/cipher-nettle.c.inc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
crypto/cipher-nettle.c.inc +14 -4
@@ -525,8 +525,10 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg, case QCRYPTO_CIPHER_MODE_CTR: drv = &qcrypto_nettle_des_driver_ctr; break; - default: + case QCRYPTO_CIPHER_MODE_XTS: goto bad_cipher_mode; + default: + g_assert_not_reached(); } ctx = g_new0(QCryptoNettleDES, 1);
@@ -551,8 +553,10 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg, case QCRYPTO_CIPHER_MODE_CTR: drv = &qcrypto_nettle_des3_driver_ctr; break; - default: + case QCRYPTO_CIPHER_MODE_XTS: goto bad_cipher_mode; + default: + g_assert_not_reached(); } ctx = g_new0(QCryptoNettleDES3, 1);
@@ -663,8 +667,10 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg, case QCRYPTO_CIPHER_MODE_CTR: drv = &qcrypto_nettle_cast128_driver_ctr; break; - default: + case QCRYPTO_CIPHER_MODE_XTS: goto bad_cipher_mode; + default: + g_assert_not_reached(); } ctx = g_new0(QCryptoNettleCAST128, 1);
@@ -741,8 +747,12 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg, case QCRYPTO_CIPHER_MODE_ECB: drv = &qcrypto_nettle_sm4_driver_ecb; break; - default: + case QCRYPTO_CIPHER_MODE_CBC: + case QCRYPTO_CIPHER_MODE_CTR: + case QCRYPTO_CIPHER_MODE_XTS: goto bad_cipher_mode; + default: + g_assert_not_reached(); } ctx = g_new0(QCryptoNettleSm4, 1);
Signature · 1 line
2.45.1