upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-23 23:28:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct handling of keys that already have a hardware/device key index:

Browse source 
this was broken in r183248 when the check of wk_keyix was replaced by
a check of IEEE80211_KEY_DEVKEY (because the flag was clobbered).  Define
IEEE80211_KEY_DEVICE to specify flags that are owned by net80211/driver
and use this to preserve IEEE80211_KEY_DEVKEY so we don't ask the driver
for another key index when we already have one.

Testing by:	Daniel Thiele, Wes Morgan
Reviewed by:	rpaulo
Approved by:	re (kib)
This commit is contained in:
Sam Leffler 2009-07-21 19:36:32 +00:00
parent 05917235c0
commit 411ccf5f63
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/net80211/ieee80211_crypto.c
View file

@ -244,11 +244,13 @@ static const char *cipher_modnames[IEEE80211_CIPHER_MAX] = {
[IEEE80211_CIPHER_NONE] = "wlan_none",
};
/* NB: there must be no overlap between user-supplied and device-owned flags */
CTASSERT((IEEE80211_KEY_COMMON & IEEE80211_KEY_DEVICE) == 0);
/*
* Establish a relationship between the specified key and cipher
* and, if necessary, allocate a hardware index from the driver.
* Note that when a fixed key index is required it must be specified
* and we blindly assign it w/o consulting the driver (XXX).
* Note that when a fixed key index is required it must be specified.
*
* This must be the first call applied to a key; all the other key
* routines assume wk_cipher is setup.
@ -309,6 +311,8 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap,
oflags = key->wk_flags;
flags &= IEEE80211_KEY_COMMON;
/* NB: preserve device attributes */
flags |= (oflags & IEEE80211_KEY_DEVICE);
/*
* If the hardware does not support the cipher then
* fallback to a host-based implementation.
@ -359,10 +363,6 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap,
key->wk_cipher = cip; /* XXX refcnt? */
key->wk_private = keyctx;
}
/*
* Commit to requested usage so driver can see the flags.
*/
key->wk_flags = flags;
/*
* Ask the driver for a key index if we don't have one.

2
sys/net80211/ieee80211_crypto.h
View file

@ -99,6 +99,8 @@ struct ieee80211_key {
};
#define IEEE80211_KEY_COMMON /* common flags passed in by apps */\
(IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP)
#define IEEE80211_KEY_DEVICE /* flags owned by device driver */\
(IEEE80211_KEY_DEVKEY|IEEE80211_KEY_CIPHER0|IEEE80211_KEY_CIPHER1)
#define IEEE80211_KEY_SWCRYPT \
(IEEE80211_KEY_SWENCRYPT | IEEE80211_KEY_SWDECRYPT)