wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 18:10:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix F-1423: AES-XTS Encrypt/Decrypt Missing skcipher_walk Cleanup on 6 Early-Return Error Paths

Browse Source
This commit is contained in:
Daniel Pouzzner
2026-06-08 18:01:51 -05:00
parent 19a9670aaa
commit 05fc258ca2
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linuxkm/lkcapi_aes_glue.c
+26 -11
View File
@@ -2079,9 +2079,6 @@ static int ccmAesAead_rfc4309_loaded = 0;
#endif /* LINUXKM_LKCAPI_REGISTER_AESCCM || LINUXKM_LKCAPI_REGISTER_AESCCM_RFC4309 */
#ifdef LINUXKM_LKCAPI_REGISTER_AESXTS
#ifndef WOLFSSL_AESXTS_STREAM
@@ -2193,7 +2190,8 @@ static int km_AesXtsEncrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsEncrypt failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, 0);
@@ -2228,7 +2226,8 @@ static int km_AesXtsEncrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsEncryptInit failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
while ((nbytes = walk.nbytes) != 0) {
@@ -2250,7 +2249,8 @@ static int km_AesXtsEncrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsEncryptUpdate failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
@@ -2284,7 +2284,8 @@ static int km_AesXtsEncrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsEncryptFinal failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, 0);
@@ -2298,6 +2299,11 @@ static int km_AesXtsEncrypt(struct skcipher_request *req)
req->cryptlen);
#endif /* WOLFKM_DEBUG_AES */
out:
if (err && walk.nbytes)
(void)skcipher_walk_done(&walk, err);
return err;
}
@@ -2331,7 +2337,8 @@ static int km_AesXtsDecrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsDecrypt failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, 0);
@@ -2365,7 +2372,8 @@ static int km_AesXtsDecrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsDecryptInit failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
while ((nbytes = walk.nbytes) != 0) {
@@ -2387,7 +2395,8 @@ static int km_AesXtsDecrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsDecryptUpdate failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
@@ -2421,7 +2430,8 @@ static int km_AesXtsDecrypt(struct skcipher_request *req)
if (unlikely(err)) {
pr_err("%s: wc_AesXtsDecryptFinal failed: %d\n",
crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm)), err);
return -EINVAL;
err = -EINVAL;
goto out;
}
err = skcipher_walk_done(&walk, 0);
@@ -2435,6 +2445,11 @@ static int km_AesXtsDecrypt(struct skcipher_request *req)
req->cryptlen);
#endif /* WOLFKM_DEBUG_AES */
out:
if (err && walk.nbytes)
(void)skcipher_walk_done(&walk, err);
return err;
}