Browse Source

mac80211: Fix misplaced return in AES-GMAC key setup

Commit 8ade538bf39b ("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>
Jouni Malinen 10 years ago
parent
commit
82ca6ef686
1 changed files with 2 additions and 2 deletions
  1. 2 2
      net/mac80211/aes_gmac.c

+ 2 - 2
net/mac80211/aes_gmac.c

@@ -69,10 +69,10 @@ struct crypto_aead *ieee80211_aes_gmac_key_setup(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)
-		return tfm;
 	if (!err)
 	if (!err)
 		err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);
 		err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);
+	if (!err)
+		return tfm;
 
 
 	crypto_free_aead(tfm);
 	crypto_free_aead(tfm);
 	return ERR_PTR(err);
 	return ERR_PTR(err);