[ Sasha's backport helper bot ]
Hi,
Summary of potential issues: ℹ️ Patch is missing in 6.13.y (ignore if backport was sent) ⚠️ Commit missing in all newer stable branches
The upstream commit SHA1 provided is correct: 7b3d52683b3a47c0ba1dfd6b5994a3a795b06972
WARNING: Author mismatch between patch and upstream commit: Backport author: Denis Arefevarefev@swemel.ru Commit author: Tianjia Zhangtianjia.zhang@linux.alibaba.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1) 5.15.y | Present (exact SHA1) 5.4.y | Not found
Note: The patch differs from the upstream commit: --- 1: 7b3d52683b3a4 ! 1: e9b5236ad8829 crypto: tcrypt - Fix missing return value check @@ Metadata ## Commit message ## crypto: tcrypt - Fix missing return value check
+ commit 7b3d52683b3a47c0ba1dfd6b5994a3a795b06972 upstream. + There are several places where the return value check of crypto_aead_setkey and crypto_aead_setauthsize were lost. It is necessary to add these checks.
At the same time, move the crypto_aead_setauthsize() call out of the loop, and only need to call it once after load transform.
- Fixee: 53f52d7aecb4 ("crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite") + Fixes: 53f52d7aecb4 ("crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite") Signed-off-by: Tianjia Zhang tianjia.zhang@linux.alibaba.com Reviewed-by: Vitaly Chikunov vt@altlinux.org Signed-off-by: Herbert Xu herbert@gondor.apana.org.au + [Denis: minor fix to resolve merge conflict.] + Signed-off-by: Denis Arefev arefev@swemel.ru
## crypto/tcrypt.c ## @@ crypto/tcrypt.c: static void test_mb_aead_speed(const char *algo, int enc, int secs, @@ crypto/tcrypt.c: static void test_aead_speed(const char *algo, int enc, unsigned if (iv_len) @@ crypto/tcrypt.c: static void test_aead_speed(const char *algo, int enc, unsigned int secs, printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ", - i, *keysize * 8, bs); + i, *keysize * 8, *b_size);
- memset(tvmem[0], 0xff, PAGE_SIZE); @@ crypto/tcrypt.c: static void test_aead_speed(const char *algo, int enc, unsigned - goto out; - } - - sg_init_aead(sg, xbuf, bs + (enc ? 0 : authsize), + sg_init_aead(sg, xbuf, *b_size + (enc ? 0 : authsize), assoc, aad_size);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success |