zcrypt crt and me fixes
Subsystems (2)
Harald Freudenberger
maintainercover zcrypt crt and me fixes
Fixes related to type50 and type6 with RSA CRT and ME.
Changelog:
v0: Just one patch fixes an AI finding with padding when a CRT
CPRB for CCA cards is constructed. Details see patch header.
Harald Freudenberger (1):
s390/zcrypt: Fix uninitialized padding in CRT key structure
drivers/s390/crypto/zcrypt_cca_key.h | 1 + 1 file changed, 1 insertion(+)
--
2.43.0
Harald Freudenberger
maintainerPATCH 1/1 s390/zcrypt: Fix uninitialized padding in CRT key structure
The zcrypt_type6_crt_key() function leaves padding bytes uninitialized between key components and the modulus in the CCA CRT key token. These padding bytes are sent to the crypto card, potentially leaking kernel memory contents.
The initial memset() only zeros fixed structure fields, not the flexible array member key_parts[] where the padding resides. While key components are properly copied from userspace, the calculated pad_len bytes between them remain uninitialized.
Fix by explicitly zeroing the padding bytes after copying the CRT key components.
--- drivers/s390/crypto/zcrypt_cca_key.h | 1 + 1 file changed, 1 insertion(+)
drivers/s390/crypto/zcrypt_cca_key.h +1 -0
@@ -219,6 +219,7 @@ static inline int zcrypt_type6_crt_key(struct ica_rsa_modexpo_crt *crt, void *p)copy_from_user (key->key_parts +2 * long_len +2 * short_len, crt->u_mult_inv, long_len)) return -EFAULT; +memset (key->key_parts +3 * long_len +2 * short_len,0 , pad_len);memset (key->key_parts +3 * long_len +2 * short_len + pad_len,0xff , crt->inputdatalength); pub = (struct cca_public_sec *)(key->key_parts + key_len);
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v1 1/1] s390/zcrypt: Fix uninitialized padding in CRT key structure
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 10 lines
The
zcrypt_type6_crt_key()function leaves padding bytes uninitialized between key components and the modulus in the CCA CRT key token. These padding bytes are sent to the crypto card, potentially leaking kernel memory contents.The initial
memset()only zeros fixed structure fields, not the flexible array member key_parts[] where the padding resides. While key components are properly copied from userspace, the calculatedpad_lenbytes between them remain uninitialized.
Quoted 4 lines
Fix by explicitly zeroing the padding bytes after copying the CRT key components.
Signed-off-by Harald Freudenberger <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Re: [PATCH v1 1/1] s390/zcrypt: Fix uninitialized padding in CRT key structure
In reply to Harald FreudenbergerQuoted 18 lines · Harald Freudenberger
The
zcrypt_type6_crt_key()function leaves padding bytes uninitialized between key components and the modulus in the CCA CRT key token. These padding bytes are sent to the crypto card, potentially leaking kernel memory contents.The initial
memset()only zeros fixed structure fields, not the flexible array member key_parts[] where the padding resides. While key components are properly copied from userspace, the calculatedpad_lenbytes between them remain uninitialized.Fix by explicitly zeroing the padding bytes after copying the CRT key components.
Signed-off-by Harald Freudenberger <[email protected]>--- drivers/s390/crypto/zcrypt_cca_key.h | 1 + 1 file changed, 1 insertion(+)
[ snip ]
Quoted 11 lines · Harald Freudenberger
Fixes related to type50 and type6 with RSA CRT and ME.
Changelog:
v0: Just one patch fixes an AI finding with padding when a CRT
CPRB for CCA cards is constructed. Details see patch header.Harald Freudenberger (1):
s390/zcrypt: Fix uninitialized padding in CRT key structuredrivers/s390/crypto/zcrypt_cca_key.h | 1 + 1 file changed, 1 insertion(+)
Applied, thank you!