| Message ID | 1437650359-2051-2-git-send-email-chaehyun.lim@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, Jul 23, 2015 at 08:19:18PM +0900, Chaehyun Lim wrote: > Add error check if memory allocation is failed. > > Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> > --- > drivers/staging/wilc1000/coreconfigurator.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c > index 7e2b2ab41..b51c15f 100644 > --- 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; Run your patches through checkpatch.pl --strict. These days we prefer: if (!pstrNetworkInfo) return -ENOMEM; These patches are nice otherwise. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 7e2b2ab41..b51c15f 100644 --- 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]; */ @@ -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);
Add error check if memory allocation is failed. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> --- drivers/staging/wilc1000/coreconfigurator.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)