staging: wilc1000: coreconfigurator.c: fix kmalloc error check (a78d9a38) · Commits · 戴 / test

drivers/staging/wilc1000/coreconfigurator.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -801,6 +801,9 @@ s32 ParseNetworkInfo(u8 pu8MsgBuffer, tstrNetworkInfo *ppstrNetworkInfo)
		u32 u32Tsf_Hi;

		pstrNetworkInfo = kmalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
		if (!pstrNetworkInfo)
		return -ENOMEM;

		memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));

		pstrNetworkInfo->s8rssi = pu8WidVal[0];
		@@ -851,6 +854,9 @@ s32 ParseNetworkInfo(u8 pu8MsgBuffer, tstrNetworkInfo *ppstrNetworkInfo)

		if (u16IEsLen > 0) {
		pstrNetworkInfo->pu8IEs = kmalloc(u16IEsLen, GFP_KERNEL);
		if (!pstrNetworkInfo->pu8IEs)
		return -ENOMEM;

		memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);

		memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
		@@ -918,6 +924,9 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
		u16 u16IEsLen = 0;

		pstrConnectRespInfo = kmalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
		if (!pstrConnectRespInfo)
		return -ENOMEM;

		memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));

		/* u16AssocRespLen = pu8Buffer[0]; */
		@@ -938,6 +947,9 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
		u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);

		pstrConnectRespInfo->pu8RespIEs = kmalloc(u16IEsLen, GFP_KERNEL);
		if (!pstrConnectRespInfo->pu8RespIEs)
		return -ENOMEM;

		memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);

		memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
		@@ -1008,10 +1020,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ

		pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
		sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
		if (pstrSurveyResults == NULL) {
		u32SurveyResultsCount = 0;
		WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
		}
		if (!pstrSurveyResults)
		return -ENOMEM;

		memset((void )(pstrSurveyResults), 0, u32SurveyResultsCount sizeof(wid_site_survey_reslts_s));

Admin message