diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2010-08-01 17:37:03 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:38 -0400 |
| commit | 1ac62ba7c985109868a18d959986425148481f47 (patch) | |
| tree | 35504e08e075978f7dcdd791bdfa2fab132b778a /net/mac80211/aes_ccm.c | |
| parent | a85d7cca1204f2dba86d2f61693f0fe8c48f0fa5 (diff) | |
| download | linux-1ac62ba7c985109868a18d959986425148481f47.tar.gz linux-1ac62ba7c985109868a18d959986425148481f47.tar.bz2 linux-1ac62ba7c985109868a18d959986425148481f47.zip | |
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: Marcin Owsiany <porridge@debian.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/aes_ccm.c')
| -rw-r--r-- | net/mac80211/aes_ccm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c index a87cb3ba2df6..d2b03e0851ef 100644 --- a/net/mac80211/aes_ccm.c +++ b/net/mac80211/aes_ccm.c @@ -138,10 +138,8 @@ 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; - - crypto_cipher_setkey(tfm, key, ALG_CCMP_KEY_LEN); + if (!IS_ERR(tfm)) + crypto_cipher_setkey(tfm, key, ALG_CCMP_KEY_LEN); return tfm; } |