samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

qcacld-3.0: Set the minsize of SuppChannels IE to 2

Bladeren bron 
qcacld-2.0 to qcacld-3.0 propagation.

Some stations send association request with zero length of SuppChannels
IE then currently dot11f decodes it to an invalid value.

To fix this, set the minsize of SuppChannels IE to 2.

Change-Id: If44807d2f2b8a62e5a137ca3d17af2e2654f72f2
CRs-Fixed: 2303702
This commit is contained in:
Vignesh Viswanathan
2018-08-27 19:09:00 +05:30
gecommit door nshrivas
bovenliggende c80030d3d8
commit 7813a3d4e0
3 gewijzigde bestanden met toevoegingen van 9 en 9 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
core/mac/src/cfg/cfgUtil/dot11f.frms
Bestand weergeven

@@ -1378,7 +1378,7 @@ IE TPCReport (EID_TPC_REPORT) // 7.3.2.18
IE SuppChannels (EID_SUPPORTED_CHANNELS) // 7.2.3.19
{
bands[2][1..48];
bands[2][0..48];
}
IE SuppOperatingClasses (EID_SUPPORTED_OPER_CLASSES)

4
core/mac/src/include/dot11f.h
Bestand weergeven

@@ -26,7 +26,7 @@
*
*
* This file was automatically generated by 'framesc'
* Wed Aug 22 00:52:30 2018 from the following file(s):
* Mon Aug 27 19:08:28 2018 from the following file(s):
*
* dot11f.frms
*
@@ -6849,7 +6849,7 @@ typedef struct sDot11fIESuppChannels {
#define DOT11F_EID_SUPPCHANNELS (36)
/* N.B. These #defines do *not* include the EID & length */
#define DOT11F_IE_SUPPCHANNELS_MIN_LEN (2)
#define DOT11F_IE_SUPPCHANNELS_MIN_LEN (0)
#define DOT11F_IE_SUPPCHANNELS_MAX_LEN (96)

12
core/mac/src/sys/legacy/src/utils/src/dot11f.c
Bestand weergeven

@@ -24,7 +24,7 @@
*
*
* This file was automatically generated by 'framesc'
* Wed Aug 22 00:52:30 2018 from the following file(s):
* Mon Aug 27 19:08:28 2018 from the following file(s):
*
* dot11f.frms
*
@@ -9484,7 +9484,7 @@ static const tIEDefn IES_AssocRequest[] = {
0, DOT11F_EID_POWERCAPS, 0, 0, },
{ offsetof(tDot11fAssocRequest, SuppChannels),
offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels",
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, 2, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fAssocRequest, HTCaps), offsetof(tDot11fIEHTCaps,
present), 0, "HTCaps", 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0},
@@ -11304,7 +11304,7 @@ static const tIEDefn IES_ReAssocRequest[] = {
0, DOT11F_EID_POWERCAPS, 0, 0, },
{ offsetof(tDot11fReAssocRequest, SuppChannels),
offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels",
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, 2, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fReAssocRequest, RSNOpaque),
offsetof(tDot11fIERSNOpaque, present), 0, "RSNOpaque",
@@ -11713,7 +11713,7 @@ static const tIEDefn IES_TDLSDisRsp[] = {
0, DOT11F_EID_EXTSUPPRATES, 0, 0, },
{ offsetof(tDot11fTDLSDisRsp, SuppChannels),
offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels",
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, 2, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fTDLSDisRsp, SuppOperatingClasses),
offsetof(tDot11fIESuppOperatingClasses, present), 0,
@@ -11923,7 +11923,7 @@ static const tIEDefn IES_TDLSSetupReq[] = {
0, DOT11F_EID_EXTSUPPRATES, 0, 0, },
{ offsetof(tDot11fTDLSSetupReq, SuppChannels),
offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels",
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, 2, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fTDLSSetupReq, RSN), offsetof(tDot11fIERSN, present), 0,
"RSN", 0, 4, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
@@ -12012,7 +12012,7 @@ static const tIEDefn IES_TDLSSetupRsp[] = {
0, DOT11F_EID_EXTSUPPRATES, 0, 0, },
{ offsetof(tDot11fTDLSSetupRsp, SuppChannels),
offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels",
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, 2, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fTDLSSetupRsp, RSN), offsetof(tDot11fIERSN, present), 0,
"RSN", 0, 4, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },