diff options
| author | Daniel Phan <daniel.phan36@gmail.com> | 2021-03-09 12:41:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-10 13:36:08 +0200 |
| commit | 7705c48b8695c8a05fe0c23443c5da7e84a9eb76 (patch) | |
| tree | 6e82003e50778abffe5d26220d92f5e58cacb8ab /net/mac80211/aead_api.c | |
| parent | 05878b6819810c28563015693c49f85ddc6fbb92 (diff) | |
| download | kernel_replicant_linux-7705c48b8695c8a05fe0c23443c5da7e84a9eb76.tar.gz kernel_replicant_linux-7705c48b8695c8a05fe0c23443c5da7e84a9eb76.tar.bz2 kernel_replicant_linux-7705c48b8695c8a05fe0c23443c5da7e84a9eb76.zip | |
mac80211: Check crypto_aead_encrypt for errors
[ Upstream commit 58d25626f6f0ea5bcec3c13387b9f835d188723d ]
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>
Signed-off-by: Sasha Levin <sashal@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, |