Skip to contentSkip to conversation

crypto: skcipher - perform len fits into blocksize check at the top

RFC PATCH In review Christian Lamparter 2 participants 2 messages May 18, 2019 Crypto API

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 crypto: skcipher - perform len fits into blocksize check at the top

This patch adds early check to test the given data length is aligned with the supported ciphers blocksize, or abort with -EINVAL in case the supplied chunk size does not fit without padding into the blocksize for block ciphers.

---

This will also work instead of the
"crypto: crypto4xx - blockciphers should only accept complete blocks" It will fix all potential driver issues in other drivers as well as break the drivers that don't have the correct blocksize set. it will also make the extra checks scattered around in the drivers make redundand as well as the extra tests that do send incomplete blocks to the hardware drivers.

---
 include/crypto/skcipher.h | 4 ++++
 1 file changed, 4 insertions(+)
include/crypto/skcipher.h +4 -0
index e555294ed77f..971294602a41 100644
@@ -494,6 +494,8 @@ static inline int crypto_skcipher_encrypt(struct skcipher_request *req)
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
 		ret = -ENOKEY;
+	else if (!IS_ALIGNED(cryptlen, crypto_skcipher_blocksize(tfm)))
+		ret = -EINVAL;
 	else
 		ret = tfm->encrypt(req);
 	crypto_stats_skcipher_encrypt(cryptlen, ret, alg);
@@ -521,6 +523,8 @@ static inline int crypto_skcipher_decrypt(struct skcipher_request *req)
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
 		ret = -ENOKEY;
+	else if (!IS_ALIGNED(cryptlen, crypto_skcipher_blocksize(tfm)))
+		ret = -EINVAL;
 	else
 		ret = tfm->decrypt(req);
 	crypto_stats_skcipher_decrypt(cryptlen, ret, alg);
Signature · 1 line
2.20.1
#1 lore raw

Hi Christian,

Quoted 35 lines · Christian Lamparter

This patch adds early check to test the given data length is aligned with the supported ciphers blocksize, or abort with -EINVAL in case the supplied chunk size does not fit without padding into the blocksize for block ciphers.

---

This will also work instead of the
"crypto: crypto4xx - blockciphers should only accept complete blocks" It will fix all potential driver issues in other drivers as well as break the drivers that don't have the correct blocksize set. it will also make the extra checks scattered around in the drivers make redundand as well as the extra tests that do send incomplete blocks to the hardware drivers.

---
 include/crypto/skcipher.h | 4 ++++
 1 file changed, 4 insertions(+)
include/crypto/skcipher.h +2 -0
index e555294ed77f..971294602a41 100644
@@ -494,6 +494,8 @@ static inline int crypto_skcipher_encrypt(struct skcipher_request *req)
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
 		ret = -ENOKEY;
+	else if (!IS_ALIGNED(cryptlen, crypto_skcipher_blocksize(tfm)))
+		ret = -EINVAL;
 	else
 		ret = tfm->encrypt(req);
 	crypto_stats_skcipher_encrypt(cryptlen, ret, alg);

include/crypto/skcipher.h static inline int crypto_skcipher_decrypt(struct skcipher_request *req) · line 530

Quoted 8 lines
include/crypto/skcipher.h +2 -0
@@ -521,6 +523,8 @@ static inline int crypto_skcipher_decrypt(struct skcipher_request *req)
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
 		ret = -ENOKEY;
+	else if (!IS_ALIGNED(cryptlen, crypto_skcipher_blocksize(tfm)))
+		ret = -EINVAL;
 	else
 		ret = tfm->decrypt(req);
 	crypto_stats_skcipher_decrypt(cryptlen, ret, alg);

Unfortunately this doesn't work because there are some skcipher algorithms ("cts" and "adiantum") that set cra_blocksize to their minimum message length
(16) rather than their length alignment requirement (1). I.e., these algorithms support all messages with length >= 16 bytes.

So before we can add this check, we need to get this straightened out.

I actually don't think "block size" should be a property of all crypto algorithms at all, e.g. for skciphers we should instead have "min_msgsize" and "msgsize_alignment". The notion of "block size" is not meaningful for length-preserving encryption algorithms in general, let alone all crypto algorithms. But unfortunately "block size" is pretty deeply embedded into the crypto API, so it doesn't look easy to fix this... Maybe for skciphers we could get away with it always meaning the msgsize_alignment, though.

- Eric