Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730bd83b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: don't kmalloc 16 bytes 



Since this small buffer isn't used for DMA,
we can simply allocate it on the stack, it
just needs to be 16 bytes of which only 8
will be used for WEP40 keys.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cc2858c9

net/mac80211/wep.c

+1 −7
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local, 
				 struct ieee80211_key *key)

{

	u32 klen;

	u8 *rc4key;

	u8 rc4key[3 + WLAN_KEY_LEN_WEP104];

	u8 keyidx;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	unsigned int hdrlen;
@@ -245,10 +245,6 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local, 


	klen = 3 + key->conf.keylen;



	rc4key = kmalloc(klen, GFP_ATOMIC);

	if (!rc4key)

		return -1;



	/* Prepend 24-bit IV to RC4 key */

	memcpy(rc4key, skb->data + hdrlen, 3);
@@ -260,8 +256,6 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local, 
				       len))

		ret = -1;



	kfree(rc4key);



	/* Trim ICV */

	skb_trim(skb, skb->len - WEP_ICV_LEN);