drivers/staging/wilc1000/host_interface.c:2852:15-22: WARNING: kzalloc should be used for pu8keybuf, instead of kmalloc/memset
drivers/staging/wilc1000/host_interface.c:2904:15-22: WARNING: kzalloc should be used for pu8keybuf, instead of kmalloc/memset
drivers/staging/wilc1000/host_interface.c:6596:15-22: WARNING: kzalloc should be used for pstrWFIDrv, instead of kmalloc/memset
Use kzalloc rather than kmalloc followed by memset with 0
This considers some simple cases that are common and easy to validate
Note in particular that there are no ...s in the rule, so all of the
matched code has to be contiguous
Generated by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci
CC: Glen Lee <glen.lee@xxxxxxxxx>
Signed-off-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
---
host_interface.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2849,15 +2849,13 @@ static int Handle_Key(tstrWILC_WFIDrv *d
case WPARxGtk:
#ifdef WILC_AP_EXTERNAL_MLME
if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY_AP) {
- pu8keybuf = kmalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
+ pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
if (pu8keybuf == NULL) {
PRINT_ER("No buffer to send RxGTK Key\n");
ret = -1;
goto _WPARxGtk_end_case_;
}
- memset(pu8keybuf, 0, RX_MIC_KEY_MSG_LEN);
-
/*|----------------------------------------------------------------------------|
* |Sta Address | Key RSC | KeyID | Key Length | Temporal Key | Rx Michael Key |
@@ -2901,15 +2899,13 @@ static int Handle_Key(tstrWILC_WFIDrv *d
if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY) {
PRINT_D(HOSTINF_DBG, "Handling group key(Rx) function\n");
- pu8keybuf = kmalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
+ pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
if (pu8keybuf == NULL) {
PRINT_ER("No buffer to send RxGTK Key\n");
ret = -1;
goto _WPARxGtk_end_case_;
}
- memset(pu8keybuf, 0, RX_MIC_KEY_MSG_LEN);
-
/*|----------------------------------------------------------------------------|
* |Sta Address | Key RSC | KeyID | Key Length | Temporal Key | Rx Michael Key |
@@ -6593,14 +6589,13 @@ s32 host_int_init(tstrWILC_WFIDrv **phWF
/*Allocate host interface private structure*/
- pstrWFIDrv = kmalloc(sizeof(tstrWILC_WFIDrv), GFP_KERNEL);
+ pstrWFIDrv = kzalloc(sizeof(tstrWILC_WFIDrv), GFP_KERNEL);
if (pstrWFIDrv == NULL) {
/* WILC_ERRORREPORT(s32Error,WILC_NO_MEM); */
s32Error = WILC_NO_MEM;
PRINT_ER("Failed to allocate memory\n");
goto _fail_timer_2;
}
- memset(pstrWFIDrv, 0, sizeof(tstrWILC_WFIDrv));
/*return driver handle to user*/
*phWFIDrv = pstrWFIDrv;
/*save into globl handle*/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
