linux-stable.git/drivers/crypto/ccree/cc_cipher.c, branch linux-5.0.y

crypto: ccree - don't copy zero size ciphertext

2019-03-23T19:11:13+00:00

commit 2b5ac17463dcb2411fed506edcf259a89bb538ba upstream.

For decryption in CBC mode we need to save the last ciphertext block
for use as the next IV. However, we were trying to do this also with
zero sized ciphertext resulting in a panic.

Fix this by only doing the copy if the ciphertext length is at least
of IV size.

Signed-off-by: Gilad Ben-Yossef 
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - unmap buffer before copying IV

2019-03-23T19:11:12+00:00

commit c139c72e2beb3e3db5148910b3962b7322e24374 upstream.

We were copying the last ciphertext block into the IV field
for CBC before removing the DMA mapping of the output buffer
with the result of the buffer sometime being out-of-sync cache
wise and were getting intermittent cases of bad output IV.

Fix it by moving the DMA buffer unmapping before the copy.

Signed-off-by: Gilad Ben-Yossef 
Fixes: 00904aa0cd59 ("crypto: ccree - fix iv handling")
Cc: 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - fix missing break in switch statement

2019-03-23T19:11:12+00:00

commit b5be853181a8d4a6e20f2073ccd273d6280cad88 upstream.

Add missing break statement in order to prevent the code from falling
through to case S_DIN_to_DES.

This bug was found thanks to the ongoing efforts to enable
-Wimplicit-fallthrough.

Fixes: 63ee04c8b491 ("crypto: ccree - add skcipher support")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - add support for CryptoCell 703

2018-12-07T06:14:59+00:00

Add support for Arm TrustZone CryptoCell 703.
The 703 is a variant of the CryptoCell 713 that supports only
algorithms certified by the Chinesse Office of the State Commercial
Cryptography Administration (OSCCA).

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - add SM4 support

2018-11-09T09:36:49+00:00

Add support for SM4 cipher in CryptoCell 713.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - allow bigger than sector XTS op

2018-08-03T10:06:05+00:00

The ccree driver had a sanity check that we are not asked
to encrypt an XTS buffer bigger than a sane sector size
since XTS IV needs to include the sector number in the IV
so this is not expected in any real use case.

Unfortunately, this breaks cryptsetup benchmark test which
has a synthetic performance test using 64k buffer of data
with the same IV.

Remove the sanity check and allow the user to hang themselves
and/or run benchmarks if they so wish.

Reported-by: Geert Uytterhoeven 
Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - zero all of request ctx before use

2018-08-03T10:06:05+00:00

In certain error path req_ctx->iv was being freed despite
not being allocated because it was not initialized to NULL.
Rather than play whack a mole with the structure various
field, zero it before use.

This fixes a kernel panic that may occur if an invalid
buffer size was requested triggering the bug above.

Fixes: 63ee04c8b491 ("crypto: ccree - add skcipher support")
Reported-by: Geert Uytterhoeven 
Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - remove cipher ivgen left overs

2018-08-03T10:06:05+00:00

IV generation is not available via the skcipher interface.
Remove the left over support of it from the ablkcipher days.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - drop useless type flag during reg

2018-08-03T10:06:05+00:00

Drop the explicit setting of CRYPTO_ALG_TYPE_AEAD or
CRYPTO_ALG_TYPE_SKCIPHER flags during alg registration as they are
set anyway by the framework.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - use CBC-CS3 CTS mode

2018-07-08T16:33:36+00:00

The ccree driver implemented NIST 800-38A CBC-CS2 ciphertext format,
which only reverses the last two blocks if the stolen ciphertext amount
are none zero. Move it to the kernel chosen format of CBC-CS3  which swaps
the final blocks unconditionally and rename it to "cts" now that it
complies with the kernel format and passes the self tests.

Ironically, the CryptoCell REE HW does just that, so the fix is dropping
the code that forced it to use plain CBC if the ciphertext was block
aligned.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu