staging: rtl8723bs: os_dep: ioctl_linux: Make use rtw_zmalloc
PATCH 1/1 staging: rtl8723bs: os_dep: ioctl_linux: Make use rtw_zmalloc
rtw_malloc with memset can be replace with rtw_zmalloc.
--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -9
@@ -478,14 +478,12 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);if (pwep ==NULL ) {RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n" )); goto exit; } -memset (pwep,0 , wep_total_len); - pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len;
@@ -2144,12 +2142,10 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,int ret =0 ; param_len =sizeof (struct ieee_param ) + pext->key_len; - param =rtw_malloc (param_len); + param =rtw_zmalloc (param_len);if (param ==NULL )return -1 ; -memset (param,0 , param_len); - param->cmd =IEEE_CMD_SET_ENCRYPTION ;memset (param->sta_addr,0xff ,ETH_ALEN );
@@ -3521,14 +3517,12 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);if (pwep ==NULL ) {DBG_871X (" r871x_set_encryption: pwep allocate fail !!!\n" ); goto exit; } -memset (pwep,0 , wep_total_len); - pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len;
Signature · 1 line
2.7.4
Quoted 12 lines · Hariprasad Kelam
rtw_mallocwith memset can be replace withrtw_zmalloc.Signed-off-by Hariprasad Kelam <[email protected]>--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0
-0
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, · line 481
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1
-1@@ -478,14 +478,12 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);
We should not introduce new uses of rtw_malloc() or rtw_zmalloc(). They are buggy garbage. Use normall kmalloc() and kzalloc().
regards,
dan carpenter
Quoted 8 lines · Dan Carpenter
Quoted 7 lines · Hariprasad Kelam
rtw_mallocwith memset can be replace withrtw_zmalloc.Signed-off-by Hariprasad Kelam <[email protected]>--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
Quoted 13 lines
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, · line 481
Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1
-1@@ -478,14 +478,12 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);We should not introduce new uses of
rtw_malloc()orrtw_zmalloc(). They are buggy garbage. Use normallkmalloc()andkzalloc().
Hi Dan Carpenter,
Sure , will resend this patch with suggested changes.
Thanks,
Hariprasad k
Quoted 3 lines
regards,
dan carpenter