Commit 82ca6ef6 authored Mar 23, 2015 by Jouni Malinen Committed by Johannes Berg Mar 30, 2015

mac80211: Fix misplaced return in AES-GMAC key setup



Commit 8ade538b ("mac80111: Add BIP-GMAC-128 and BIP-GMAC-256
ciphers") had the success return in incorrect place before the
crypto_aead_setauthsize() call which practically ended up skipping that
call unconditionally.

The missing call did not actually change any functionality since
GMAC_MIC_LEN (16) is identical to the maxauthsize in gcm(aes) and as
such, the default value used for the authsize parameter.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 6bab2e19

net/mac80211/aes_gmac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,10 +69,10 @@ struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],
		return tfm;

		err = crypto_aead_setkey(tfm, key, key_len);
		if (!err)
		return tfm;
		if (!err)
		err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);
		if (!err)
		return tfm;

		crypto_free_aead(tfm);
		return ERR_PTR(err);

Admin message