diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-06-22 01:26:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-22 01:26:37 -0700 |
| commit | f312bfaaef920f8f32fe6302d6db3ee311198aa7 (patch) | |
| tree | 2f0b456457329b4f3e2c2477de447beda39e0aff | |
| parent | be8659cfaf6feab8cba0d8846b7b330d00bd74d7 (diff) | |
| parent | bf6a8da3af24a1156de797abc461544881cb5529 (diff) | |
Merge "qcacld-2.0: Add check for min buffer length in find_ie_defn" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/MAC/src/include/dot11f.h | 2 | ||||
| -rw-r--r-- | CORE/SYS/legacy/src/utils/src/dot11f.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h index b3a61e23f4fa..95f2eb4630de 100644 --- a/CORE/MAC/src/include/dot11f.h +++ b/CORE/MAC/src/include/dot11f.h @@ -32,7 +32,7 @@ * \brief Structures, function prototypes & definitions * for working with 802.11 Frames * This file was automatically generated by 'framesc' - * Wed Jun 13 10:58:49 2018 from the following file(s): + * Wed Jun 13 13:53:03 2018 from the following file(s): * * dot11f.frms * diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c index b3cb14bae9c5..144c2d3ef627 100644 --- a/CORE/SYS/legacy/src/utils/src/dot11f.c +++ b/CORE/SYS/legacy/src/utils/src/dot11f.c @@ -30,7 +30,7 @@ * \brief Structures, functions & definitions for * working with 802.11 Frames * This file was automatically generated by 'framesc' - * Wed Jun 13 10:58:49 2018 from the following file(s): + * Wed Jun 13 13:53:03 2018 from the following file(s): * * dot11f.frms * @@ -455,8 +455,9 @@ static const tIEDefn* FindIEDefn(tpAniSirGlobal pCtx, if (*pBuf == pIe->eid) { if (pIe->eid == 0xff) { - if ((*(pBuf + 2)) == pIe->extn_eid) - return pIe; + if ((nBuf > 2) && + (*(pBuf + 2)) == pIe->extn_eid) + return pIe; } else { if (0 == pIe->noui) return pIe; |