* [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC
@ 2015-07-23 23:55 Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check Chaehyun Lim
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Chaehyun Lim @ 2015-07-23 23:55 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, linux-wireless,
devel, Chaehyun Lim
Use kmalloc and kmalloc_array instead of WILC_MALLOC.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2: Use GFP_KERNEL flag instead of GFP_ATOMIC
drivers/staging/wilc1000/coreconfigurator.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index b069614..fb37367 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -674,7 +674,7 @@ s32 CoreConfiguratorInit(void)
sema_init(&SemHandleSendPkt, 1);
sema_init(&SemHandlePktResp, 0);
- gps8ConfigPacket = (s8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE);
+ gps8ConfigPacket = kmalloc(MAX_PACKET_BUFF_SIZE, GFP_KERNEL);
if (gps8ConfigPacket == NULL) {
PRINT_ER("failed in gps8ConfigPacket allocation\n");
s32Error = WILC_NO_MEM;
@@ -811,7 +811,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
u32 u32Tsf_Lo;
u32 u32Tsf_Hi;
- pstrNetworkInfo = (tstrNetworkInfo *)WILC_MALLOC(sizeof(tstrNetworkInfo));
+ pstrNetworkInfo = kmalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
WILC_memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));
pstrNetworkInfo->s8rssi = pu8WidVal[0];
@@ -862,7 +862,7 @@ 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 = (u8 *)WILC_MALLOC(u16IEsLen);
+ pstrNetworkInfo->pu8IEs = kmalloc(u16IEsLen, GFP_KERNEL);
WILC_memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);
WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
@@ -929,7 +929,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
u8 *pu8IEs = 0;
u16 u16IEsLen = 0;
- pstrConnectRespInfo = (tstrConnectRespInfo *)WILC_MALLOC(sizeof(tstrConnectRespInfo));
+ pstrConnectRespInfo = kmalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
WILC_memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));
/* u16AssocRespLen = pu8Buffer[0]; */
@@ -949,7 +949,7 @@ 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 = (u8 *)WILC_MALLOC(u16IEsLen);
+ pstrConnectRespInfo->pu8RespIEs = kmalloc(u16IEsLen, GFP_KERNEL);
WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
@@ -1018,7 +1018,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
}
}
- pstrSurveyResults = (wid_site_survey_reslts_s *)WILC_MALLOC(u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));
+ pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
+ sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
if (pstrSurveyResults == NULL) {
u32SurveyResultsCount = 0;
WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V3 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check
2015-07-23 23:55 [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Chaehyun Lim
@ 2015-07-23 23:55 ` Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 3/3] staging: wilc1000: coreconfigurator.c: fix " Chaehyun Lim
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Chaehyun Lim @ 2015-07-23 23:55 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, linux-wireless,
devel, Chaehyun Lim
Add error check if memory allocation is failed.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2: use ! operator instead of NULL comparison
V3: this patch is rebased by previous modification
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 fb37367..0ff9705 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_KERNEL);
+ if (!pstrNetworkInfo)
+ 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_KERNEL);
+ if (!pstrNetworkInfo->pu8IEs)
+ 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_KERNEL);
+ if (!pstrConnectRespInfo)
+ 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_KERNEL);
+ if (!pstrConnectRespInfo->pu8RespIEs)
+ return -ENOMEM;
+
WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V3 3/3] staging: wilc1000: coreconfigurator.c: fix kmalloc error check
2015-07-23 23:55 [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check Chaehyun Lim
@ 2015-07-23 23:55 ` Chaehyun Lim
2015-07-24 0:44 ` [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Dan Carpenter
2015-07-29 20:45 ` Greg KH
3 siblings, 0 replies; 6+ messages in thread
From: Chaehyun Lim @ 2015-07-23 23:55 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, linux-wireless,
devel, Chaehyun Lim
Return -ENOMEM if memory allocation is failed.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2: Use ! operator instead of NULL comparison
V3: this patch is rebased by previous modification
drivers/staging/wilc1000/coreconfigurator.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 0ff9705..b2abd8b 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -675,11 +675,8 @@ s32 CoreConfiguratorInit(void)
sema_init(&SemHandlePktResp, 0);
gps8ConfigPacket = kmalloc(MAX_PACKET_BUFF_SIZE, GFP_KERNEL);
- if (gps8ConfigPacket == NULL) {
- PRINT_ER("failed in gps8ConfigPacket allocation\n");
- s32Error = WILC_NO_MEM;
- goto _fail_;
- }
+ if (!gps8ConfigPacket)
+ return -ENOMEM;
WILC_memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE);
@@ -1032,10 +1029,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
- if (pstrSurveyResults == NULL) {
- u32SurveyResultsCount = 0;
- WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
- }
+ if (!pstrSurveyResults)
+ return -ENOMEM;
WILC_memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC
2015-07-23 23:55 [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 3/3] staging: wilc1000: coreconfigurator.c: fix " Chaehyun Lim
@ 2015-07-24 0:44 ` Dan Carpenter
[not found] ` <55B59D8D.6010805@atmel.com>
2015-07-29 20:45 ` Greg KH
3 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2015-07-24 0:44 UTC (permalink / raw)
To: Chaehyun Lim
Cc: gregkh, rachel.kim, dean.lee, chris.park, devel, linux-wireless,
johnny.kim
On Fri, Jul 24, 2015 at 08:55:53AM +0900, Chaehyun Lim wrote:
> Use kmalloc and kmalloc_array instead of WILC_MALLOC.
>
> Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
> ---
> V2: Use GFP_KERNEL flag instead of GFP_ATOMIC
This is probably the correct thing but how did you check that we aren't
holding a spin_lock or in IRQ context?
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC
[not found] ` <55B59D8D.6010805@atmel.com>
@ 2015-07-27 7:52 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2015-07-27 7:52 UTC (permalink / raw)
To: tony.cho
Cc: Chaehyun Lim, gregkh, rachel.kim, dean.lee, chris.park, devel,
linux-wireless, johnny.kim
> On 2015년 07월 24일 09:44, Dan Carpenter wrote:
> >On Fri, Jul 24, 2015 at 08:55:53AM +0900, Chaehyun Lim wrote:
> >>Use kmalloc and kmalloc_array instead of WILC_MALLOC.
> >>
> >>Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
> >>---
> >>V2: Use GFP_KERNEL flag instead of GFP_ATOMIC
> >This is probably the correct thing but how did you check that we aren't
> >holding a spin_lock or in IRQ context?
Thanks for the reply Tony, but I was really just trying to see how
Chaehyun checks his patches or if they are automatically generated.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC
2015-07-23 23:55 [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Chaehyun Lim
` (2 preceding siblings ...)
2015-07-24 0:44 ` [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Dan Carpenter
@ 2015-07-29 20:45 ` Greg KH
3 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2015-07-29 20:45 UTC (permalink / raw)
To: Chaehyun Lim
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, linux-wireless, devel
On Fri, Jul 24, 2015 at 08:55:53AM +0900, Chaehyun Lim wrote:
> Use kmalloc and kmalloc_array instead of WILC_MALLOC.
>
> Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
> ---
> V2: Use GFP_KERNEL flag instead of GFP_ATOMIC
Please answer Dan's question for the next time you resend this series, I
can't take these as-is so am dropping them from my queue.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-29 20:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-23 23:55 [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 2/3] staging: wilc1000: coreconfigurator.c: add kmalloc error check Chaehyun Lim
2015-07-23 23:55 ` [PATCH V3 3/3] staging: wilc1000: coreconfigurator.c: fix " Chaehyun Lim
2015-07-24 0:44 ` [PATCH V2 1/3] staging: wilc1000: coreconfigurator.c: remove WILC_MALLOC Dan Carpenter
[not found] ` <55B59D8D.6010805@atmel.com>
2015-07-27 7:52 ` Dan Carpenter
2015-07-29 20:45 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.