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>
This commit is contained in:
Johannes Berg 2015-03-23 17:08:14 +03:00
parent 45fd63293a
commit 07862e13e6
1 changed files with 8 additions and 4 deletions

View File

@ -80,11 +80,15 @@ struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],
return tfm; return tfm;
err = crypto_aead_setkey(tfm, key, key_len); err = crypto_aead_setkey(tfm, key, key_len);
if (!err) if (err)
err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN); goto free_aead;
if (!err) err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN);
return tfm; if (err)
goto free_aead;
return tfm;
free_aead:
crypto_free_aead(tfm); crypto_free_aead(tfm);
return ERR_PTR(err); return ERR_PTR(err);
} }