Commit 02cf299d authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: replace kmalloc/memcpy with kmemdup 



This patch replaces kmalloc followed by memset and memcpy with kmemdup.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef154414

drivers/staging/wilc1000/coreconfigurator.c

+3 −9
Original line number Diff line number Diff line
@@ -488,13 +488,10 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) 
		u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);



		if (u16IEsLen > 0) {

			pstrNetworkInfo->pu8IEs = kmalloc(u16IEsLen, GFP_KERNEL);

			pstrNetworkInfo->pu8IEs = kmemdup(pu8IEs, u16IEsLen,

							  GFP_KERNEL);

			if (!pstrNetworkInfo->pu8IEs)

				return -ENOMEM;



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



			memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);

		}

		pstrNetworkInfo->u16IEsLen = u16IEsLen;
@@ -578,13 +575,10 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, 
		pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];

		u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);



		pstrConnectRespInfo->pu8RespIEs = kmalloc(u16IEsLen, GFP_KERNEL);

		pstrConnectRespInfo->pu8RespIEs = kmemdup(pu8IEs, u16IEsLen, GFP_KERNEL);

		if (!pstrConnectRespInfo->pu8RespIEs)

			return -ENOMEM;



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



		memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);

		pstrConnectRespInfo->u16RespIEsLen = u16IEsLen;

	}