samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Enable EAPOL logging for FILS Authentication

Browse Source 
In api __qdf_nbuf_data_get_eapol_subtype(), the EAPOL key_info
is evaluated only for SAE authentication, which result in EAPOL
logging failure for FILS authentication.

Check ACK and Secure bit in EAPOL key_info to determine
EAPOL packet irrespective of authentication protocol.

Change-Id: Ieef143d36d85cbf473b682810d658de93dbbdad2
CRs-Fixed: 3268362
This commit is contained in:
vijaraj
2022-09-07 00:20:19 -07:00
committed by Madan Koyyalamudi
parent 527b0343a3
commit 8b843ae157
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qdf/inc/qdf_nbuf.h
View File

@@ -103,11 +103,6 @@
#define EAPOL_KEY_LEN_OFFSET 21 #define EAPOL_KEY_LEN_OFFSET 21
#define EAPOL_PACKET_TYPE_EAP 0 #define EAPOL_PACKET_TYPE_EAP 0
#define EAPOL_PACKET_TYPE_KEY 3 #define EAPOL_PACKET_TYPE_KEY 3
#define EAPOL_MASK 0x8013
#define EAPOL_M1_BIT_MASK 0x8000
#define EAPOL_M2_BIT_MASK 0x0001
#define EAPOL_M3_BIT_MASK 0x8013
#define EAPOL_M4_BIT_MASK 0x0003
#define EAPOL_KEY_TYPE_MASK 0x0800 #define EAPOL_KEY_TYPE_MASK 0x0800
#define EAPOL_KEY_ENCRYPTED_MASK 0x0010 #define EAPOL_KEY_ENCRYPTED_MASK 0x0010

8
qdf/linux/src/qdf_nbuf.c
View File

@@ -1322,6 +1322,11 @@ __qdf_nbuf_data_get_dhcp_subtype(uint8_t *data)
return subtype; return subtype;
} }
#define EAPOL_MASK 0x8002
#define EAPOL_M1_BIT_MASK 0x8000
#define EAPOL_M2_BIT_MASK 0x0000
#define EAPOL_M3_BIT_MASK 0x8002
#define EAPOL_M4_BIT_MASK 0x0002
/** /**
* __qdf_nbuf_data_get_eapol_subtype() - get the subtype * __qdf_nbuf_data_get_eapol_subtype() - get the subtype
* of EAPOL packet. * of EAPOL packet.
@@ -1342,6 +1347,7 @@ __qdf_nbuf_data_get_eapol_subtype(uint8_t *data)
(data + EAPOL_KEY_INFO_OFFSET)); (data + EAPOL_KEY_INFO_OFFSET));
mask = eapol_key_info & EAPOL_MASK; mask = eapol_key_info & EAPOL_MASK;
switch (mask) { switch (mask) {
case EAPOL_M1_BIT_MASK: case EAPOL_M1_BIT_MASK:
subtype = QDF_PROTO_EAPOL_M1; subtype = QDF_PROTO_EAPOL_M1;
@@ -1355,8 +1361,6 @@ __qdf_nbuf_data_get_eapol_subtype(uint8_t *data)
case EAPOL_M4_BIT_MASK: case EAPOL_M4_BIT_MASK:
subtype = QDF_PROTO_EAPOL_M4; subtype = QDF_PROTO_EAPOL_M4;
break; break;
default:
break;
} }
return subtype; return subtype;