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

Commit 74eaa42b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: fix GTK length check in ParseKeyData() 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 118d67df

drivers/staging/rt2860/sta/wpa.c

+0 −5
Original line number Diff line number Diff line
@@ -1764,12 +1764,7 @@ BOOLEAN ParseKeyData( 
	// Get GTK length - refer to IEEE 802.11i-2004 p.82

	GTKLEN = pKDE->Len -6;



#ifdef RT30xx

	if (GTKLEN < LEN_AES_KEY)

#endif

#ifndef RT30xx

	if (GTKLEN < MIN_LEN_OF_GTK)

#endif

	{

		DBGPRINT(RT_DEBUG_ERROR, ("ERROR: GTK Key length is too short (%d) \n", GTKLEN));

        return FALSE;

drivers/staging/rt2860/wpa.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define TKIP_AP_RXMICK_OFFSET		(TKIP_AP_TXMICK_OFFSET+LEN_TKIP_TXMICK)

#define TKIP_GTK_LENGTH				((LEN_TKIP_EK)+(LEN_TKIP_RXMICK)+(LEN_TKIP_TXMICK))

#define LEN_PTK						((LEN_EAP_KEY)+(LEN_TKIP_KEY))

#define MIN_LEN_OF_GTK				5



// RSN IE Length definition

#define MAX_LEN_OF_RSNIE         	90