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

Commit 17f83045 authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: incorrect shift direction 



Looks like  5d2cdcd4 ("mac80211: get a
TKIP phase key from skb") got the shifts wrong.

Noticed by sparse:
net/mac80211/tkip.c:234:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:235:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:236:25: warning: right shift by bigger than source value

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 636c5d48

net/mac80211/tkip.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -230,10 +230,8 @@ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf, 




	iv16 = data[hdr_len] << 8;

	iv16 = data[hdr_len] << 8;

	iv16 += data[hdr_len + 2];

	iv16 += data[hdr_len + 2];

	iv32 = data[hdr_len + 4] +

	iv32 = data[hdr_len + 4] | (data[hdr_len + 5] << 8) |

		(data[hdr_len + 5] >> 8) +

	       (data[hdr_len + 6] << 16) | (data[hdr_len + 7] << 24);

		(data[hdr_len + 6] >> 16) +

		(data[hdr_len + 7] >> 24);





#ifdef CONFIG_TKIP_DEBUG

#ifdef CONFIG_TKIP_DEBUG

	printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",

	printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",