|
@@ -325,7 +325,8 @@ ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,
|
|
|
struct ieee80211_key *key;
|
|
|
int i, j, err;
|
|
|
|
|
|
- BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS);
|
|
|
+ if (WARN_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS))
|
|
|
+ return ERR_PTR(-EINVAL);
|
|
|
|
|
|
key = kzalloc(sizeof(struct ieee80211_key) + key_len, GFP_KERNEL);
|
|
|
if (!key)
|
|
@@ -481,8 +482,8 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
|
|
int idx, ret;
|
|
|
bool pairwise;
|
|
|
|
|
|
- BUG_ON(!sdata);
|
|
|
- BUG_ON(!key);
|
|
|
+ if (WARN_ON(!sdata || !key))
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
|
|
idx = key->conf.keyidx;
|