lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ben Hutchings
2010-08-01 17:37:03 +01:00
committed by John W. Linville
parent a85d7cca12
commit 1ac62ba7c9
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/cfg.c
View File

@@ -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);