summaryrefslogtreecommitdiff
path: root/net/mac80211/aead_api.c
diff options
context:
space:
mode:
authorDaniel Phan <daniel.phan36@gmail.com>2021-03-09 23:41:36 +0300
committerJohannes Berg <johannes.berg@intel.com>2021-03-16 23:20:41 +0300
commit58d25626f6f0ea5bcec3c13387b9f835d188723d (patch)
tree256b1998b86fe2e441b9d0e035b3048a10698386 /net/mac80211/aead_api.c
parent0f7e90faddeef53a3568f449a0c3992d77510b66 (diff)
downloadlinux-58d25626f6f0ea5bcec3c13387b9f835d188723d.tar.xz
mac80211: Check crypto_aead_encrypt for errors
crypto_aead_encrypt returns <0 on error, so if these calls are not checked, execution may continue with failed encrypts. It also seems that these two crypto_aead_encrypt calls are the only instances in the codebase that are not checked for errors. Signed-off-by: Daniel Phan <daniel.phan36@gmail.com> Link: https://lore.kernel.org/r/20210309204137.823268-1-daniel.phan36@gmail.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/aead_api.c')
-rw-r--r--net/mac80211/aead_api.c5
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,