leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Check crypto_aead_encrypt for errors

Browse Source 
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>
This commit is contained in:
Daniel Phan 2021-03-09 12:41:36 -08:00 committed by Johannes Berg
parent 0f7e90fadd
commit 58d25626f6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/aead_api.c
View File

@ -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; struct aead_request *aead_req;
int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm); int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
u8 *__aad; u8 *__aad;
int ret;
aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC); aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);
if (!aead_req) 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_crypt(aead_req, sg, sg, data_len, b_0);
aead_request_set_ad(aead_req, sg[0].length); aead_request_set_ad(aead_req, sg[0].length);
crypto_aead_encrypt(aead_req); ret = crypto_aead_encrypt(aead_req);
kfree_sensitive(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, int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,

5
net/mac80211/aes_gmac.c
View File

@ -22,6 +22,7 @@ int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
struct aead_request *aead_req; struct aead_request *aead_req;
int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm); int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
const __le16 *fc; const __le16 *fc;
int ret;
if (data_len < GMAC_MIC_LEN) if (data_len < GMAC_MIC_LEN)
return -EINVAL; return -EINVAL;
@ -59,10 +60,10 @@ int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
aead_request_set_crypt(aead_req, sg, sg, 0, iv); aead_request_set_crypt(aead_req, sg, sg, 0, iv);
aead_request_set_ad(aead_req, GMAC_AAD_LEN + data_len); aead_request_set_ad(aead_req, GMAC_AAD_LEN + data_len);
crypto_aead_encrypt(aead_req); ret = crypto_aead_encrypt(aead_req);
kfree_sensitive(aead_req); kfree_sensitive(aead_req);
return 0; return ret;
} }
struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[], struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],