Commit 45fd6329 authored Mar 23, 2015 by Dan Carpenter Committed by Johannes Berg Mar 30, 2015

mac80111: aes_ccm: cleanup ieee80211_aes_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.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 82ca6ef6

net/mac80211/aes_ccm.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,11 +85,15 @@ struct crypto_aead *ieee80211_aes_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)
			goto free_aead;
	err = crypto_aead_setauthsize(tfm, mic_len);		err = crypto_aead_setauthsize(tfm, mic_len);
	if (!err)		if (err)
			goto free_aead;

	return tfm;		return tfm;

			free_aead:
	crypto_free_aead(tfm);		crypto_free_aead(tfm);
	return ERR_PTR(err);		return ERR_PTR(err);
	}		}