linux-toradex.git/arch/s390/crypto, branch master

Merge tag 'v7.3-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2026-09-22T17:10:08+00:00

Pull crypto fix from Herbert Xu:
 "This fixes an hmac hashing bug on s390"

* tag 'v7.3-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390/hmac - Generate intermediate CV for API partial block handling

crypto: s390/hmac - Generate intermediate CV for API partial block handling

2026-09-19T01:52:05+00:00

The API partial block handling requires a intermediate chaining
value (CV). The internal function hash_data() sets the function code
correctly, so also call cpacf_kimd() instruction for intermediate CV
generation, as cpacf_klmd() always generate the final hash value.

Cc: stable@vger.kernel.org # 6.15+
Fixes: 08811169ac01 ("crypto: s390/hmac - Use API partial block handling")
Signed-off-by: Holger Dengler 
Reviewed-by: Harald Freudenberger 
Signed-off-by: Herbert Xu

s390/crypto: Enable CONTEXT_ANALYSIS

2026-09-08T13:53:41+00:00

Enable CONTEXT_ANALYSIS since s390's crypto code compiles now without
warnings.

Reviewed-by: Harald Freudenberger 
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Map EBUSY to EIO when key conversion fails repeatedly

2026-09-08T13:53:41+00:00

When hardware persistently returns -EBUSY after exhausting retries,
the error propagates to crypto_finalize_*_request(). The crypto API's
completion wrapper treats -EBUSY as a queueing status and swallows it,
preventing the completion callback from firing. This causes callers
using crypto_wait_req() to block indefinitely.

Translate persistent -EBUSY to -EIO after retry exhaustion to ensure
proper error propagation and callback invocation.

Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.16+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix wrong return code to engine in asynch callbacks

2026-09-08T13:53:41+00:00

When crypto_finalize_hash_request() or
crypto_finalize_skcipher_request() explicitly completes a request, the
do_one_request callback must return 0 to indicate successful
handling. Returning a negative error code causes the crypto engine to
assume the driver failed to take ownership and triggers a second
completion via crypto_request_complete(), resulting in a double
completion. This pattern occurs in paes_s390.c 4 times and once in
phmac_s390.c.

Fixed in phmac_do_one_request() and all four paes do_one_request
callbacks (ecb, cbc, ctr, xts) by returning 0 after explicit
finalization instead of propagating the error code.

Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.16+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix handling of EBUSY in PHMAC when req is pushed to crypto engine

2026-09-08T13:53:41+00:00

When a request is transferred to the engine via
crypto_transfer_hash_request_to_engine() there are two return codes
signaling a successful transfer: EINPROGRESS and EBUSY. However the
correct handling of EBUSY was missing and has been added as a return
code indicating a successful transfer to the crypto engine.

Fixes: cbbc675506cc ("crypto: s390 - New s390 specific protected key hash phmac")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.17+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix handling of EBUSY in PAES when req is pushed to crypto engine

2026-09-08T13:53:41+00:00

When a request is transferred to the engine via
crypto_transfer_skcipher_request_to_engine() there are two return
codes signaling a successful transfer: EINPROGRESS and EBUSY. However
the correct handling of EBUSY was missing and has been added as a
return code indicating a successful transfer to the crypto engine.

Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.16+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix missing cra_flags in paes_s390

2026-09-08T13:53:41+00:00

The 4 algorithms implemented in paes_s390 never had any cra_flags
set. So add code which sets the cra_flag to CRYPTO_ALG_ASYNC and
CRYPTO_ALG_NO_FALLBACK.

Fixes: 4ccd065a69df ("crypto: ahash - Add support for drivers with no fallback")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.17+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix use of mutex in atomic context in PAES

2026-09-08T13:53:41+00:00

The PAES CTR implementation used a mutex to lock one page of exclusive
memory for fast CTR processing. Unfortunately a mutex is not save to
use in atomic or interrupt context. So use a binary semaphore instead
which is save to use in such environments.

Furthermore rework the code to get rid of conditional locking. So
restructure the PAES CRT code by extracting the main loop into a
separate function and just give in information about the (locked) page
can be used or not (is not locked).

Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.16+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik

s390/crypto: Fix missing scrub of temp buffers with PAES algorithm

2026-09-08T13:53:41+00:00

In function ctr_paes_do_crypt() there is a buffer used to process
remaining bytes < AES_BLOCK_SIZE. This buffer was not scrubbed and
thus could lead to expose of unwanted data. Rework the code to
explicitly scrub the buffer at the end of the function to avoid
exposure of maybe sensitive data.

In function __xts_2keys_prep_param() change the existing scrub to
clean the whole param block instead of just the key field.

Fixes: 6cd87cb5ef6c ("s390/crypto: Rework protected key AES for true asynch support")
Signed-off-by: Harald Freudenberger 
Reviewed-by: Holger Dengler 
Cc: stable@vger.kernel.org # 6.16+
Signed-off-by: Heiko Carstens 
Signed-off-by: Vasily Gorbik