Commit 1ac62ba7 authored by Ben Hutchings's avatar Ben Hutchings Committed by John W. Linville
Browse files

mac80211: Don't squash error codes in key setup functions 



ieee80211_add_key() currently returns -ENOMEM in case of any error,
including a missing crypto algorithm.  Change ieee80211_key_alloc()
and ieee80211_aes_{key_setup_encrypt,cmac_key_setup}() to encode
errors with ERR_PTR() rather than returning NULL, and change
ieee80211_add_key() accordingly.

Compile-tested only.

Reported-by: default avatarMarcin Owsiany <porridge@debian.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a85d7cca

net/mac80211/aes_ccm.c

+2 −4
Original line number Diff line number Diff line
@@ -138,9 +138,7 @@ struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]) 
	struct crypto_cipher *tfm;



	tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(tfm))

		return NULL;



	if (!IS_ERR(tfm))

		crypto_cipher_setkey(tfm, key, ALG_CCMP_KEY_LEN);



	return tfm;

net/mac80211/aes_cmac.c

+2 −4
Original line number Diff line number Diff line
@@ -119,9 +119,7 @@ struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[]) 
	struct crypto_cipher *tfm;



	tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(tfm))

		return NULL;



	if (!IS_ERR(tfm))

		crypto_cipher_setkey(tfm, key, AES_CMAC_KEY_LEN);



	return tfm;

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 


	key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key,

				  params->seq_len, params->seq);

	if (!key)

		return -ENOMEM;

	if (IS_ERR(key))

		return PTR_ERR(key);



	mutex_lock(&sdata->local->sta_mtx);

net/mac80211/key.c

+8 −6
Original line number Diff line number Diff line
@@ -234,13 +234,13 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, 
					  size_t seq_len, const u8 *seq)

{

	struct ieee80211_key *key;

	int i, j;

	int i, j, err;



	BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS);



	key = kzalloc(sizeof(struct ieee80211_key) + key_len, GFP_KERNEL);

	if (!key)

		return NULL;

		return ERR_PTR(-ENOMEM);



	/*

	 * Default to software encryption; we'll later upload the
@@ -296,9 +296,10 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, 
		 * it does not need to be initialized for every packet.

		 */

		key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(key_data);

		if (!key->u.ccmp.tfm) {

		if (IS_ERR(key->u.ccmp.tfm)) {

			err = PTR_ERR(key->u.ccmp.tfm);

			kfree(key);

			return NULL;

			key = ERR_PTR(err);

		}

	}
@@ -309,9 +310,10 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, 
		 */

		key->u.aes_cmac.tfm =

			ieee80211_aes_cmac_key_setup(key_data);

		if (!key->u.aes_cmac.tfm) {

		if (IS_ERR(key->u.aes_cmac.tfm)) {

			err = PTR_ERR(key->u.aes_cmac.tfm);

			kfree(key);

			return NULL;

			key = ERR_PTR(err);

		}

	}