Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ef2b7c2 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove unnecessary rtw_z?malloc casts 



These functions now return void * and no longer need casts.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35628c4a

drivers/staging/rtl8723bs/core/rtw_ap.c

+4 −6
Original line number Diff line number Diff line
@@ -1581,15 +1581,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(

		sizeof(struct set_stakey_parm)

	);

	psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

	if (psetstakey_para == NULL) {

		kfree((u8 *) ph2c);

		res = _FAIL;
@@ -1630,12 +1628,12 @@ static int rtw_ap_set_key( 


	/* DBG_871X("%s\n", __func__); */



	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

		res = _FAIL;

		goto exit;

	}

	psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));

	psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));

	if (psetkeyparm == NULL) {

		kfree((unsigned char *)pcmd);

		res = _FAIL;

drivers/staging/rtl8723bs/core/rtw_cmd.c

+42 −42
Original line number Diff line number Diff line
@@ -613,11 +613,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);

	}



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL)

		return _FAIL;



	psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));

	psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));

	if (psurveyPara == NULL) {

		kfree((unsigned char *) ph2c);

		return _FAIL;
@@ -681,13 +681,13 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pbsetdataratepara = (struct setdatarate_parm *)rtw_zmalloc(sizeof(struct setdatarate_parm));

	pbsetdataratepara = rtw_zmalloc(sizeof(struct setdatarate_parm));

	if (pbsetdataratepara == NULL) {

		kfree((u8 *) ph2c);

		res = _FAIL;
@@ -724,7 +724,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter) 
		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));

	}



	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

		res = _FAIL;

		goto exit;
@@ -757,7 +757,7 @@ u8 rtw_startbss_cmd(struct adapter *padapter, int flags) 
		start_bss_network(padapter, (u8 *)&(padapter->mlmepriv.cur_network.network));

	} else {

		/* need enqueue, prepare cmd_obj and enqueue */

		pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

		if (pcmd == NULL) {

			res = _FAIL;

			goto exit;
@@ -815,7 +815,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));

	}



	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

		res = _FAIL;

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
@@ -943,7 +943,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu 
	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));



	/* prepare cmd parameter */

	param = (struct disconnect_parm *)rtw_zmalloc(sizeof(*param));

	param = rtw_zmalloc(sizeof(*param));

	if (param == NULL) {

		res = _FAIL;

		goto exit;
@@ -952,7 +952,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu 


	if (enqueue) {

		/* need enqueue, prepare cmd_obj and enqueue */

		cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(*cmdobj));

		cmdobj = rtw_zmalloc(sizeof(*cmdobj));

		if (cmdobj == NULL) {

			res = _FAIL;

			kfree((u8 *)param);
@@ -979,7 +979,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum NDIS_802_11_NETWORK_INFRAST 
	struct	cmd_priv   *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	psetop = (struct setopmode_parm *)rtw_zmalloc(sizeof(struct setopmode_parm));

	psetop = rtw_zmalloc(sizeof(struct setopmode_parm));



	if (psetop == NULL) {

		res = _FAIL;
@@ -988,7 +988,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum NDIS_802_11_NETWORK_INFRAST 
	psetop->mode = (u8)networktype;



	if (enqueue) {

		ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

			kfree((u8 *)psetop);

			res = _FAIL;
@@ -1016,7 +1016,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ 
	struct security_priv 	*psecuritypriv = &padapter->securitypriv;

	u8 res = _SUCCESS;



	psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));

	psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

	if (psetstakey_para == NULL) {

		res = _FAIL;

		goto exit;
@@ -1040,14 +1040,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ 
	padapter->securitypriv.busetkipkey = true;



	if (enqueue) {

		ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

			kfree((u8 *) psetstakey_para);

			res = _FAIL;

			goto exit;

		}



		psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));

		psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));

		if (psetstakey_rsp == NULL) {

			kfree((u8 *) ph2c);

			kfree((u8 *) psetstakey_para);
@@ -1083,20 +1083,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu 
			rtw_camid_free(padapter, cam_id);

		}

	} else{

		ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

			res = _FAIL;

			goto exit;

		}



		psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));

		psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

		if (psetstakey_para == NULL) {

			kfree((u8 *) ph2c);

			res = _FAIL;

			goto exit;

		}



		psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));

		psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));

		if (psetstakey_rsp == NULL) {

			kfree((u8 *) ph2c);

			kfree((u8 *) psetstakey_para);
@@ -1128,13 +1128,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr) 


	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	paddbareq_parm = (struct addBaReq_parm *)rtw_zmalloc(sizeof(struct addBaReq_parm));

	paddbareq_parm = rtw_zmalloc(sizeof(struct addBaReq_parm));

	if (paddbareq_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1162,13 +1162,13 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1197,13 +1197,13 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1233,13 +1233,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	/* only  primary padapter does this cmd */

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1283,7 +1283,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf 
	}



	/* prepare cmd parameter */

	setChannelPlan_param = (struct	SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param));

	setChannelPlan_param = rtw_zmalloc(sizeof(struct SetChannelPlan_param));

	if (setChannelPlan_param == NULL) {

		res = _FAIL;

		goto exit;
@@ -1292,7 +1292,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf 


	if (enqueue) {

		/* need enqueue, prepare cmd_obj and enqueue */

		pcmdobj = (struct	cmd_obj *)rtw_zmalloc(sizeof(struct	cmd_obj));

		pcmdobj = rtw_zmalloc(sizeof(struct cmd_obj));

		if (pcmdobj == NULL) {

			kfree((u8 *)setChannelPlan_param);

			res = _FAIL;
@@ -1553,13 +1553,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) 
	/* 	return res; */



	if (enqueue) {

		ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

			res = _FAIL;

			goto exit;

		}



		pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

		pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

		if (pdrvextra_cmd_parm == NULL) {

			kfree((unsigned char *)ph2c);

			res = _FAIL;
@@ -1595,13 +1595,13 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;





	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1668,13 +1668,13 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta) 
	u8 res = _SUCCESS;





	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1719,13 +1719,13 @@ u8 rtw_ps_cmd(struct adapter *padapter) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ppscmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ppscmd == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ppscmd);

		res = _FAIL;
@@ -1791,13 +1791,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;
@@ -1890,13 +1890,13 @@ u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((u8 *)ph2c);

		res = _FAIL;
@@ -1925,13 +1925,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt) 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

		kfree((u8 *)ph2c);

		res = _FAIL;
@@ -1967,7 +1967,7 @@ static void c2h_wk_callback(_workitem *work) 
			/* This C2H event is read, clear it */

			c2h_evt_clear(adapter);

		} else{

			c2h_evt = (u8 *)rtw_malloc(16);

			c2h_evt = rtw_malloc(16);

			if (c2h_evt != NULL) {

				/* This C2H event is not read, read & clear now */

				if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) {

drivers/staging/rtl8723bs/core/rtw_mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -2272,13 +2272,13 @@ sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) 
	struct	cmd_priv *pcmdpriv = &(adapter->cmdpriv);

	sint		res = _SUCCESS;



	pcmd = (struct	cmd_obj *)rtw_zmalloc(sizeof(struct	cmd_obj));

	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

		res = _FAIL;  /* try again */

		goto exit;

	}



	psetauthparm = (struct setauth_parm *)rtw_zmalloc(sizeof(struct setauth_parm));

	psetauthparm = rtw_zmalloc(sizeof(struct setauth_parm));

	if (psetauthparm == NULL) {

		kfree((unsigned char *)pcmd);

		res = _FAIL;
@@ -2313,7 +2313,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s 
	struct cmd_priv 	*pcmdpriv = &(adapter->cmdpriv);

	sint	res = _SUCCESS;



	psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));

	psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));

	if (psetkeyparm == NULL) {

		res = _FAIL;

		goto exit;
@@ -2365,7 +2365,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s 




	if (enqueue) {

		pcmd = (struct	cmd_obj *)rtw_zmalloc(sizeof(struct	cmd_obj));

		pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

		if (pcmd == NULL) {

			kfree((unsigned char *)psetkeyparm);

			res = _FAIL;  /* try again */

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+18 −18
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) 
	if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {

		if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) {

			/* we should update current network before auth, or some IE is wrong */

			pbss = (struct wlan_bssid_ex *)rtw_malloc(sizeof(struct wlan_bssid_ex));

			pbss = rtw_malloc(sizeof(struct wlan_bssid_ex));

			if (pbss) {

				if (collect_bss_info(padapter, precv_frame, pbss) == _SUCCESS) {

					update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true);
@@ -5049,12 +5049,12 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame 
	pmlmeext = &padapter->mlmeextpriv;

	pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

		return;



	cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5102,12 +5102,12 @@ void report_surveydone_event(struct adapter *padapter) 
	struct mlme_ext_priv 	*pmlmeext = &padapter->mlmeextpriv;

	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

		return;



	cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5149,12 +5149,12 @@ void report_join_res(struct adapter *padapter, int res) 
	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

		return;



	cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5200,12 +5200,12 @@ void report_wmm_edca_update(struct adapter *padapter) 
	struct mlme_ext_priv 	*pmlmeext = &padapter->mlmeextpriv;

	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

		return;



	cmdsz = (sizeof(struct wmm_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5246,13 +5246,13 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi 
	struct mlme_ext_priv 	*pmlmeext = &padapter->mlmeextpriv;

	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL) {

		return;

	}



	cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5302,12 +5302,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int 
	struct mlme_ext_priv 	*pmlmeext = &padapter->mlmeextpriv;

	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

		return;



	cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

		kfree((u8 *)pcmd_obj);

		return;
@@ -5853,12 +5853,12 @@ void survey_timer_hdl(struct adapter *padapter) 
			pmlmeext->scan_abort = false;/* reset */

		}



		ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

			goto exit_survey_timer_hdl;

		}



		psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));

		psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));

		if (psurveyPara == NULL) {

			kfree((unsigned char *)ph2c);

			goto exit_survey_timer_hdl;
@@ -6602,7 +6602,7 @@ u8 chk_bmc_sleepq_cmd(struct adapter *padapter) 
	struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);

	u8 res = _SUCCESS;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;
@@ -6626,13 +6626,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;

	int len_diff = 0;



	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc(sizeof(struct Tx_Beacon_param));

	ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));

	if (ptxBeacon_parm == NULL) {

		kfree((unsigned char *)ph2c);

		res = _FAIL;

drivers/staging/rtl8723bs/core/rtw_security.c

+1 −1
Original line number Diff line number Diff line
@@ -2272,7 +2272,7 @@ static void *aes_encrypt_init(u8 *key, size_t len) 
	u32 *rk;

	if (len != 16)

		return NULL;

	rk = (u32 *)rtw_malloc(AES_PRIV_SIZE);

	rk = rtw_malloc(AES_PRIV_SIZE);

	if (rk == NULL)

		return NULL;

	rijndaelKeySetupEnc(rk, key);