diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-03-06 03:45:57 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-03-06 03:45:57 -0800 |
| commit | 56fcdb990921e7ba162b6be5ea0773962611bb97 (patch) | |
| tree | 49c5517ddf72d9e1daf70df7de27877e41d77af5 | |
| parent | 6a357cf11af2929d9c3710159f4035b4b7a2e101 (diff) | |
| parent | 81794cbff1f7ff1ed130de1511e5101f94b1fc9f (diff) | |
Merge 81794cbff1f7ff1ed130de1511e5101f94b1fc9f on remote branch
Change-Id: Ieba0403e76bb638a50751d654af6499a4b2b3f20
| -rw-r--r-- | core/hdd/src/wlan_hdd_assoc.c | 11 | ||||
| -rw-r--r-- | core/mac/inc/qwlan_version.h | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 618b2875813a..dff5e4fec567 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -2258,8 +2258,9 @@ static void hdd_send_re_assoc_event(struct net_device *dev, goto done; } - if (pCsrRoamInfo->nAssocRspLength == 0) { - hdd_err("Assoc rsp length is 0"); + if (pCsrRoamInfo->nAssocRspLength < FT_ASSOC_RSP_IES_OFFSET) { + hdd_err("Invalid assoc rsp length %d", + pCsrRoamInfo->nAssocRspLength); goto done; } @@ -2289,6 +2290,10 @@ static void hdd_send_re_assoc_event(struct net_device *dev, /* Send the Assoc Resp, the supplicant needs this for initial Auth */ len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET; + if (len > IW_GENERIC_IE_MAX) { + hdd_err("Invalid Assoc resp length %d", len); + goto done; + } rspRsnLength = len; qdf_mem_copy(rspRsnIe, pFTAssocRsp, len); qdf_mem_zero(rspRsnIe + len, IW_GENERIC_IE_MAX - len); diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index b42e20c62967..4f6f782c30b8 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 1 -#define QWLAN_VERSION_EXTRA "C" +#define QWLAN_VERSION_EXTRA "D" #define QWLAN_VERSION_BUILD 76 -#define QWLAN_VERSIONSTR "5.1.1.76C" +#define QWLAN_VERSIONSTR "5.1.1.76D" #endif /* QWLAN_VERSION_H */ |