Commit 23976efe authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

mac80211: don't accept WEP keys other than WEP40 and WEP104 



This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor
WEP104.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1bcca3c4

include/net/mac80211.h

+9 −0
Original line number Diff line number Diff line
@@ -595,6 +595,15 @@ enum ieee80211_key_alg { 
	ALG_CCMP,

};



/**

 * enum ieee80211_key_len - key length

 * @WEP40: WEP 5 byte long key

 * @WEP104: WEP 13 byte long key

 */

enum ieee80211_key_len {

	LEN_WEP40 = 5,

	LEN_WEP104 = 13,

};



/**

 * enum ieee80211_key_flags - key flags

net/mac80211/wext.c

+7 −0
Original line number Diff line number Diff line
@@ -95,6 +95,13 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr, 
			}

		}



		if (alg == ALG_WEP &&

			key_len != LEN_WEP40 && key_len != LEN_WEP104) {

			ieee80211_key_free(key);

			err = -EINVAL;

			goto out_unlock;

		}



		ieee80211_key_link(key, sdata, sta);



		if (set_tx_key || (!sta && !sdata->default_key && key))

CRA Git | Maintained and supported by SUSTech CRA and CCSE