From 9c33be0c8026d067d9b93abab765299957310d6b Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Wed, 11 Feb 2015 15:47:00 -0800 Subject: qcacld: Add NULL check in SME GetCommandBuffer routine This change set adds NULL check to avoid accessing unallocated memory. Change-Id: Icb62ea402ff77c2e727d5777b87ef2c8885f3f98 CRs-Fixed: 794668 --- CORE/SME/src/sme_common/sme_Api.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 54c580364a62..0915f94f1d50 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -455,9 +455,12 @@ tSmeCmd *smeGetCommandBuffer( tpAniSirGlobal pMac ) } /* memset to zero */ - vos_mem_set((tANI_U8 *)&pRetCmd->command, sizeof(pRetCmd->command), 0); - vos_mem_set((tANI_U8 *)&pRetCmd->sessionId, sizeof(pRetCmd->sessionId), 0); - vos_mem_set((tANI_U8 *)&pRetCmd->u, sizeof(pRetCmd->u), 0); + if (pRetCmd) { + vos_mem_set((tANI_U8 *)&pRetCmd->command, sizeof(pRetCmd->command), 0); + vos_mem_set((tANI_U8 *)&pRetCmd->sessionId, + sizeof(pRetCmd->sessionId), 0); + vos_mem_set((tANI_U8 *)&pRetCmd->u, sizeof(pRetCmd->u), 0); + } return(pRetCmd); } -- cgit v1.2.3 From 273ccf74bdc2cff9932b6f8f2b72d7feae1cdc85 Mon Sep 17 00:00:00 2001 From: AnjaneeDevi Kapparapu Date: Thu, 12 Feb 2015 14:41:12 +0530 Subject: Cafstaging Release 4.0.10.33 Cafstaging Release 4.0.10.33 Change-Id: I7ab376a4e429d0efbc41e94a9d8b4467b2bb1e75 CRs-Fixed: 688141 --- CORE/MAC/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index da728e083c7e..921abe3e1e02 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 10 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 32 +#define QWLAN_VERSION_BUILD 33 -#define QWLAN_VERSIONSTR "4.0.10.32" +#define QWLAN_VERSIONSTR "4.0.10.33" #define AR6320_REV1_VERSION 0x5000000 -- cgit v1.2.3