diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2025-04-12 09:48:09 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2025-04-12 09:48:09 +0800 |
| commit | 51a7c741f7e1c00839167a89a3d2a382a6d482f2 (patch) | |
| tree | ed32b458fdce898ebdb89c20a203c044969b8e34 /include | |
| parent | crypto: x86/chacha - Restore SSSE3 fallback path (diff) | |
| parent | crypto: ahash - Disable request chaining (diff) | |
| download | linux-51a7c741f7e1c00839167a89a3d2a382a6d482f2.tar.gz linux-51a7c741f7e1c00839167a89a3d2a382a6d482f2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up scompress and ahash fixes. The
scompress fix becomes mostly unnecessary as the bugs no longer
exist with the new acompress code. However, keep the NULL assignment
in crypto_acomp_free_streams so that if the user decides to call
crypto_acomp_alloc_streams again it will work.
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/hash.h | 6 | ||||
| -rw-r--r-- | include/crypto/internal/hash.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index b987904afdba..a13e2de3c9b4 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -10,6 +10,7 @@ #include <linux/atomic.h> #include <linux/crypto.h> +#include <linux/slab.h> #include <linux/string.h> /* Set this bit for virtual address instead of SG list. */ @@ -581,7 +582,10 @@ static inline struct ahash_request *ahash_request_alloc_noprof( * ahash_request_free() - zeroize and free the request data structure * @req: request data structure cipher handle to be freed */ -void ahash_request_free(struct ahash_request *req); +static inline void ahash_request_free(struct ahash_request *req) +{ + kfree_sensitive(req); +} static inline struct ahash_request *ahash_request_cast( struct crypto_async_request *req) diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h index 485e22cf517e..052ac7924af3 100644 --- a/include/crypto/internal/hash.h +++ b/include/crypto/internal/hash.h @@ -249,7 +249,7 @@ static inline struct crypto_shash *__crypto_shash_cast(struct crypto_tfm *tfm) static inline bool ahash_request_chained(struct ahash_request *req) { - return crypto_request_chained(&req->base); + return false; } static inline bool ahash_request_isvirt(struct ahash_request *req) |