[PATCH 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check

Joe Perches joe at perches.com
Thu Jul 23 17:19:41 UTC 2015


On Thu, 2015-07-23 at 20:19 +0900, Chaehyun Lim wrote:
> Add error check if memory allocation is failed.

trivia:

> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
[]
> @@ -812,6 +812,9 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
>  		u32 u32Tsf_Hi;
>  
>  		pstrNetworkInfo = kmalloc(sizeof(tstrNetworkInfo), GFP_ATOMIC);
> +		if (pstrNetworkInfo == NULL)
> +			return -ENOMEM;
> +
>  		WILC_memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));
>  
>  		pstrNetworkInfo->s8rssi = pu8WidVal[0];
> @@ -863,6 +866,9 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
>  
>  		if (u16IEsLen > 0) {
>  			pstrNetworkInfo->pu8IEs = kmalloc(u16IEsLen, GFP_ATOMIC);
> +			if (pstrNetworkInfo->pu8IEs == NULL)
> +				return -ENOMEM;
> +
>  			WILC_memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);
>  
>  			WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
> @@ -930,6 +936,9 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
>  	u16 u16IEsLen = 0;
>  
>  	pstrConnectRespInfo = kmalloc(sizeof(tstrConnectRespInfo), GFP_ATOMIC);
> +	if (pstrConnectRespInfo == NULL)
> +		return -ENOMEM;
> +
>  	WILC_memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));
>  
>  	/* u16AssocRespLen = pu8Buffer[0]; */

These could use kzalloc

> @@ -950,6 +959,9 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
>  		u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
>  
>  		pstrConnectRespInfo->pu8RespIEs = kmalloc(u16IEsLen, GFP_ATOMIC);
> +		if (pstrConnectRespInfo->pu8RespIEs == NULL)
> +			return -ENOMEM;
> +
>  		WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
>  
>  		WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);

And this one could use kmemdup




More information about the devel mailing list