diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
| commit | feecb81732d8f271440d907beb082425e109f877 (patch) | |
| tree | af55ca33d43cf3b3c2b82e9860df7d01be061a0f /net/mac80211/aead_api.c | |
| parent | MAINTAINERS: Add myself as futex reviewer (diff) | |
| parent | Linux 5.12-rc5 (diff) | |
| download | wireguard-linux-feecb81732d8f271440d907beb082425e109f877.tar.xz wireguard-linux-feecb81732d8f271440d907beb082425e109f877.zip | |
Merge tag 'v5.12-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mac80211/aead_api.c')
| -rw-r--r-- | net/mac80211/aead_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/aead_api.c b/net/mac80211/aead_api.c index d7b3d905d535..b00d6f5b33f4 100644 --- a/net/mac80211/aead_api.c +++ b/net/mac80211/aead_api.c @@ -23,6 +23,7 @@ int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len, struct aead_request *aead_req; int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm); u8 *__aad; + int ret; aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC); if (!aead_req) @@ -40,10 +41,10 @@ int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len, aead_request_set_crypt(aead_req, sg, sg, data_len, b_0); aead_request_set_ad(aead_req, sg[0].length); - crypto_aead_encrypt(aead_req); + ret = crypto_aead_encrypt(aead_req); kfree_sensitive(aead_req); - return 0; + return ret; } int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len, |