64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h b/drivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h
|
|
index 111c093..10f1872 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h
|
|
@@ -24,7 +24,6 @@
|
|
* under proprietary terms before Copyright ownership was assigned
|
|
* to the Linux Foundation.
|
|
*/
|
|
-
|
|
#ifndef DOT11F_H
|
|
#define DOT11F_H
|
|
/**
|
|
@@ -37,7 +36,7 @@
|
|
*
|
|
*
|
|
* This file was automatically generated by 'framesc'
|
|
- * Tue Sep 29 17:32:33 2015 from the following file(s):
|
|
+ * Tue Jul 4 11:07:27 2017 from the following file(s):
|
|
*
|
|
* dot11f.frms
|
|
*
|
|
@@ -91,8 +90,8 @@
|
|
#define DOT11F_BUFFER_OVERFLOW ( 0x10000005 )
|
|
#define DOT11F_MANDATORY_TLV_MISSING ( 0x00001000 )
|
|
#define DOT11F_FAILED(code) ( (code) & 0x10000000 )
|
|
-#define DOT11F_WARNED(code) ( ( ( 0 == (code) ) & 0x10000000 ) && code)
|
|
#define DOT11F_SUCCEEDED(code) ( (code) == 0 )
|
|
+#define DOT11F_WARNED(code) (!DOT11F_SUCCEEDED(code) && !DOT11F_FAILED(code))
|
|
|
|
/*********************************************************************
|
|
* Fixed Fields *
|
|
diff --git a/drivers/staging/qcacld-2.0/CORE/SYS/legacy/src/utils/src/dot11f.c b/drivers/staging/qcacld-2.0/CORE/SYS/legacy/src/utils/src/dot11f.c
|
|
index 0f542d0..c19e9c0 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/SYS/legacy/src/utils/src/dot11f.c
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/SYS/legacy/src/utils/src/dot11f.c
|
|
@@ -35,7 +35,7 @@
|
|
*
|
|
*
|
|
* This file was automatically generated by 'framesc'
|
|
- * Tue Sep 29 17:32:33 2015 from the following file(s):
|
|
+ * Tue Jul 4 11:07:27 2017 from the following file(s):
|
|
*
|
|
* dot11f.frms
|
|
*
|
|
@@ -18778,6 +18778,10 @@
|
|
}
|
|
|
|
countOffset = ( (0 != pIe->arraybound) * ( *(tANI_U16* )(pFrm + pIe->countOffset)));
|
|
+ if (0 != pIe->arraybound && countOffset >= pIe->arraybound) {
|
|
+ status |= DOT11F_DUPLICATE_IE;
|
|
+ goto skip_dup_ie;
|
|
+ }
|
|
switch (pIe->sig)
|
|
{
|
|
case SigIeCondensedCountryStr:
|
|
@@ -19215,6 +19219,7 @@
|
|
status |= DOT11F_UNKNOWN_IES;
|
|
}
|
|
|
|
+skip_dup_ie:
|
|
pBufRemaining += len;
|
|
|
|
if (len > nBufRemaining)
|