mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-13 18:49:22 -04:00
staging: wilc1000: replace kmalloc/memcpy with kmemdup
This patch replaces kmalloc followed by memset and memcpy with kmemdup. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ef154414b2
commit
02cf299d0e
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user