diff options
| author | Eytan Lifshitz <eytan.lifshitz@intel.com> | 2014-07-21 14:18:41 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-07-21 16:04:27 +0200 |
| commit | 60e83deb4c1e7e8b6ab78e7331288bf4211bdeb6 (patch) | |
| tree | 2ee5bbc0a22f447b2ca3983723d6f1f089ac262c /net/mac80211/key.c | |
| parent | mac80211: fix a potential NULL access in ieee80211_crypto_hw_decrypt (diff) | |
| download | linux-60e83deb4c1e7e8b6ab78e7331288bf4211bdeb6.tar.xz linux-60e83deb4c1e7e8b6ab78e7331288bf4211bdeb6.zip | |
mac80211: remove useless NULL checks
sdata can't be NULL, and key being NULL is really not possible
unless the code is modified.
The sdata check made a static analyze (klocwork) unhappy because
we would get pointer to local (sdata->local) and only then check
if sdata is non-NULL.
Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
[remove !key check as well]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 16d97f044a20..d808cff80153 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -482,9 +482,6 @@ int ieee80211_key_link(struct ieee80211_key *key, int idx, ret; bool pairwise; - if (WARN_ON(!sdata || !key)) - return -EINVAL; - pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE; idx = key->conf.keyidx; key->local = sdata->local; |