diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-03-23 17:08:14 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-30 10:42:02 +0200 |
| commit | 07862e13e60305e3026aaff88c764b4bafa02a64 (patch) | |
| tree | f1672c75f880a236826feb79ee8f618bd6b22af8 | |
| parent | 45fd63293a214c48d6d3856bb39cf207a805dfda (diff) | |
| download | blackbird-op-linux-07862e13e60305e3026aaff88c764b4bafa02a64.tar.gz blackbird-op-linux-07862e13e60305e3026aaff88c764b4bafa02a64.zip | |
mac80111: aes_gcm: clean up ieee80211_aes_gcm_key_setup_encrypt()
This code is written using an anti-pattern called "success handling"
which makes it hard to read, especially if you are used to normal kernel
style. It should instead be written as a list of directives in a row
with branches for error handling.
(Basically copied from Dan's previous patch for CCM)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/aes_gcm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/mac80211/aes_gcm.c b/net/mac80211/aes_gcm.c index c2bf6698d738..fd278bbe1b0d 100644 --- a/net/mac80211/aes_gcm.c +++ b/net/mac80211/aes_gcm.c @@ -80,11 +80,15 @@ struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[], return tfm; err = crypto_aead_setkey(tfm, key, key_len); - if (!err) - err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN); - if (!err) - return tfm; + if (err) + goto free_aead; + err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN); + if (err) + goto free_aead; + + return tfm; +free_aead: crypto_free_aead(tfm); return ERR_PTR(err); } |
