Staging: rtl8723bs: core: rtw_mlme_ext.c: Remove typecast in kfree
PATCH v3 1/1 Staging: rtl8723bs: core: rtw_mlme_ext.c: Remove typecast in kfree
Remove typecast in kfree, as per definition of kfree in include/linux/slab.h#L144, the parameter type of kfree is void*, and hence C compiler casts any pointer type to void*.
that is allocated with kmalloc.
---
Changes in v3 -
- Tested and compiled the patch
Changes in v2:
- Commit log modified
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +11 -11
@@ -816,7 +816,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true);rtw_get_bcn_info (&(pmlmepriv->cur_network)); } -kfree ((u8 *)pbss); +kfree (pbss); }/* check the vendor of the assoc AP */
@@ -5052,7 +5052,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame cmdsz = (sizeof (struct survey_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5073,8 +5073,8 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame psurvey_evt = (struct survey_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));if (collect_bss_info (padapter, precv_frame, (struct wlan_bssid_ex *)&psurvey_evt->bss) == _FAIL) { -kfree ((u8 *)pcmd_obj); -kfree ((u8 *)pevtcmd); +kfree (pcmd_obj); +kfree (pevtcmd);return ; }
@@ -5105,7 +5105,7 @@ void report_surveydone_event(struct adapter *padapter) cmdsz = (sizeof (struct surveydone_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5152,7 +5152,7 @@ void report_join_res(struct adapter *padapter, int res) cmdsz = (sizeof (struct joinbss_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5203,7 +5203,7 @@ void report_wmm_edca_update(struct adapter *padapter) cmdsz = (sizeof (struct wmm_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5250,7 +5250,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi cmdsz = (sizeof (struct stadel_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5305,7 +5305,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cmdsz = (sizeof (struct stassoc_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }
@@ -5836,7 +5836,7 @@ void survey_timer_hdl(struct timer_list *t) psurveyPara =rtw_zmalloc (sizeof (struct sitesurvey_parm ));if (psurveyPara ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); goto exit_survey_timer_hdl; }
@@ -6603,7 +6603,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) ptxBeacon_parm =rtw_zmalloc (sizeof (struct Tx_Beacon_param ));if (ptxBeacon_parm ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); res = _FAIL; goto exit; }
Signature · 1 line
2.17.1
For the subject line, you should follow the same strategy as other patches on this file.
Quoted 4 lines · Madhumitha Prabakaran
Remove typecast in kfree, as per definition of kfree in include/linux/slab.h#L144, the parameter type of kfree is void*, and hence C compiler casts any pointer type to void*.
that is allocated with kmalloc.
Whether or not the argument was allocated with kmalloc is not relevant. The C compiler considers any pointer type compatible with void *. It doesn't know where the value came from.
julia
Quoted 120 lines
Signed-off-by Madhumitha Prabakaran <[email protected]>---
Changes in v3 -- Tested and compiled the patch
Changes in v2:
- Commit log modified
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +11
-12@@ -816,7 +816,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true);rtw_get_bcn_info (&(pmlmepriv->cur_network)); } -kfree ((u8 *)pbss); +kfree (pbss); }/* check the vendor of the assoc AP */ @@ -5052,7 +5052,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame cmdsz = (sizeof (struct survey_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5073,8 +5073,8 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame psurvey_evt = (struct survey_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));if (collect_bss_info (padapter, precv_frame, (struct wlan_bssid_ex *)&psurvey_evt->bss) == _FAIL) { -kfree ((u8 *)pcmd_obj); -kfree ((u8 *)pevtcmd); +kfree (pcmd_obj); +kfree (pevtcmd);return ; }@@ -5105,7 +5105,7 @@ void report_surveydone_event(struct adapter *padapter) cmdsz = (sizeof (struct surveydone_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5152,7 +5152,7 @@ void report_join_res(struct adapter *padapter, int res) cmdsz = (sizeof (struct joinbss_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5203,7 +5203,7 @@ void report_wmm_edca_update(struct adapter *padapter) cmdsz = (sizeof (struct wmm_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5250,7 +5250,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi cmdsz = (sizeof (struct stadel_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5305,7 +5305,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cmdsz = (sizeof (struct stassoc_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5836,7 +5836,7 @@ void survey_timer_hdl(struct timer_list *t) psurveyPara =rtw_zmalloc (sizeof (struct sitesurvey_parm ));if (psurveyPara ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); goto exit_survey_timer_hdl; }@@ -6603,7 +6603,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) ptxBeacon_parm =rtw_zmalloc (sizeof (struct Tx_Beacon_param ));if (ptxBeacon_parm ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); res = _FAIL; goto exit; } --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190401182614.14755-1-madhumithabiw%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
Quoted 5 lines · Julia Lawall
For the subject line, you should follow the same strategy as other patches on this file.
On Mon, 1 Apr 2019, Madhumitha Prabakaran wrote:
Quoted 8 lines
Quoted 4 lines
Remove typecast in kfree, as per definition of kfree in include/linux/slab.h#L144, the parameter type of kfree is void*, and hence C compiler casts any pointer type to void*.
that is allocated with kmalloc.Whether or not the argument was allocated with kmalloc is not relevant. The C compiler considers any pointer type compatible with void *. It doesn't know where the value came from.
will fix it.
thanks
Quoted 130 lines
julia
Quoted 120 lines
Signed-off-by Madhumitha Prabakaran <[email protected]>---
Changes in v3 -- Tested and compiled the patch
Changes in v2:
- Commit log modified
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +11
-12@@ -816,7 +816,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true);rtw_get_bcn_info (&(pmlmepriv->cur_network)); } -kfree ((u8 *)pbss); +kfree (pbss); }/* check the vendor of the assoc AP */ @@ -5052,7 +5052,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame cmdsz = (sizeof (struct survey_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5073,8 +5073,8 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame psurvey_evt = (struct survey_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));if (collect_bss_info (padapter, precv_frame, (struct wlan_bssid_ex *)&psurvey_evt->bss) == _FAIL) { -kfree ((u8 *)pcmd_obj); -kfree ((u8 *)pevtcmd); +kfree (pcmd_obj); +kfree (pevtcmd);return ; }@@ -5105,7 +5105,7 @@ void report_surveydone_event(struct adapter *padapter) cmdsz = (sizeof (struct surveydone_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5152,7 +5152,7 @@ void report_join_res(struct adapter *padapter, int res) cmdsz = (sizeof (struct joinbss_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5203,7 +5203,7 @@ void report_wmm_edca_update(struct adapter *padapter) cmdsz = (sizeof (struct wmm_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5250,7 +5250,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi cmdsz = (sizeof (struct stadel_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5305,7 +5305,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cmdsz = (sizeof (struct stassoc_event ) +sizeof (struct C2HEvent_Header )); pevtcmd =rtw_zmalloc (cmdsz);if (pevtcmd ==NULL ) { -kfree ((u8 *)pcmd_obj); +kfree (pcmd_obj);return ; }@@ -5836,7 +5836,7 @@ void survey_timer_hdl(struct timer_list *t) psurveyPara =rtw_zmalloc (sizeof (struct sitesurvey_parm ));if (psurveyPara ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); goto exit_survey_timer_hdl; }@@ -6603,7 +6603,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) ptxBeacon_parm =rtw_zmalloc (sizeof (struct Tx_Beacon_param ));if (ptxBeacon_parm ==NULL ) { -kfree ((unsigned char *)ph2c); +kfree (ph2c); res = _FAIL; goto exit; } --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190401182614.14755-1-madhumithabiw%40gmail.com.
For more options, visit https://groups.google.com/d/optout.Signature · 5 lines
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1904012129550.2530%40hadrien. For more options, visit https://groups.google.com/d/optout.