: memory leak in rtw_free_cmd_obj if command is (_Set_Drv_Extra)
PATCH 1/1 : memory leak in rtw_free_cmd_obj if command is (_Set_Drv_Extra)
pcmd->parmbuf->pbuf has been allocated if command is GEN_CMD_CODE(_Set_Drv_Extra), and it enqueued by rtw_enqueue_cmd. rtw_cmd_thread dequeue pcmd by rtw_dequeue_cmd. The memory leak happened on this branch "if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) )" which goto post_process directly against freeing pcmd->parmbuf->pbuf in rtw_drvextra_cmd_hdl which is the cmd_hdl if command is (_Set_Drv_Extra). This patch free pcmd->parmbuf->pbuf on the forgotten branch to avoid memory leak.
drivers/staging/rtl8188eu/core/rtw_cmd.c +6 -1
@@ -288,7 +288,7 @@ int rtw_cmd_thread(void *context)void (*pcmd_callback)(struct adapter *dev,struct cmd_obj *pcmd);struct adapter *padapter = (struct adapter *)context;struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); - +struct drvextra_cmd_parm *extra_parm =NULL ;thread_enter ("RTW_CMD_THREAD" );
@@ -323,6 +323,11 @@ _next:if (_FAIL ==rtw_cmd_filter (pcmdpriv, pcmd)) { pcmd->res =H2C_DROPPED ; +if (pcmd->cmdcode ==GEN_CMD_CODE (_Set_Drv_Extra)) { + extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf; +if (extra_parm && extra_parm->pbuf && extra_parm->size >0 ) +rtw_mfree (extra_parm->pbuf, extra_parm->size); + } goto post_process; }
Greg KH
maintainerRe: [PATCH] staging: r8188eu: memory leak in rtw_free_cmd_obj if command is (_Set_Drv_Extra)
Quoted 9 lines · Xiaoming
pcmd->parmbuf->pbufhas been allocated if command isGEN_CMD_CODE(_Set_Drv_Extra), and it enqueued byrtw_enqueue_cmd.rtw_cmd_threaddequeue pcmd byrtw_dequeue_cmd. The memory leak happened on this branch "if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) )" which gotopost_processdirectly against freeingpcmd->parmbuf->pbufinrtw_drvextra_cmd_hdlwhich is thecmd_hdlif command is (_Set_Drv_Extra). This patch freepcmd->parmbuf->pbufon the forgotten branch to avoid memory leak.Signed-off-by Zhang Dongxing <[email protected]>Signed-off-by xiaoming wang <[email protected]>
You obviously didn't test this as it breaks the build :(
{sigh}
Please retry after 3.15-rc1 is out.
Quoted 15 lines · Xiaoming
pcmd->parmbuf->pbufhas been allocated if command isGEN_CMD_CODE(_Set_Drv_Extra), and it enqueued byrtw_enqueue_cmd.rtw_cmd_threaddequeue pcmd byrtw_dequeue_cmd. The memory leak happened on this branch "if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) )" which gotopost_processdirectly against freeingpcmd->parmbuf->pbufinrtw_drvextra_cmd_hdlwhich is thecmd_hdlif command is (_Set_Drv_Extra). This patch freepcmd->parmbuf->pbufon the forgotten branch to avoid memory leak.Signed-off-by Zhang Dongxing <[email protected]>Signed-off-by xiaoming wang <[email protected]>drivers/staging/rtl8188eu/core/rtw_cmd.c +0
-0
drivers/staging/rtl8188eu/core/rtw_cmd.c int rtw_cmd_thread(void *context) · line 291
Quoted 5 lines
drivers/staging/rtl8188eu/core/rtw_cmd.c +1
-1@@ -288,7 +288,7 @@ int rtw_cmd_thread(void *context)void (*pcmd_callback)(struct adapter *dev,struct cmd_obj *pcmd);struct adapter *padapter = (struct adapter *)context;struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); - +struct drvextra_cmd_parm *extra_parm =NULL ;
Don't do this. It disables GCC's uninitialized variable check so it can hide bugs. It's just another assignment to read and remember so it takes reviewer time.
drivers/staging/rtl8188eu/core/rtw_cmd.c _next: · line 329
Quoted 11 lines
drivers/staging/rtl8188eu/core/rtw_cmd.c +4
-0thread_enter ("RTW_CMD_THREAD" );@@ -323,6 +323,11 @@ _next:if (_FAIL ==rtw_cmd_filter (pcmdpriv, pcmd)) { pcmd->res =H2C_DROPPED ; +if (pcmd->cmdcode ==GEN_CMD_CODE (_Set_Drv_Extra)) { + extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf; +if (extra_parm && extra_parm->pbuf && extra_parm->size >0 ) +rtw_mfree (extra_parm->pbuf, extra_parm->size);
Like Greg says, there isn't a rtw_mfree() anymore. This code is so confusing and GEN_CMD_CODE is horrible and
"make drivers/staging/rtl8188eu/core/rtw_cmd.i" doesn't work and I don't know how to even review this... :/ But I'll try again when you re-submit.
drivers/staging/rtl8188eu/core/rtw_cmd.c _next: · line 333
Quoted 4 lines
drivers/staging/rtl8188eu/core/rtw_cmd.c +1
-0+ } goto post_process; }
regards,
dan carpenter