: 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 forgotten branch to avoid memory leak.
drivers/staging/rtl8188eu/core/rtw_cmd.c +6 -0
@@ -314,6 +314,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 ; _func_enter_;
@@ -350,6 +351,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; }
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 forgotten branch to avoid memory leak.Signed-off-by Zhang Dongxing <[email protected]>Signed-off-by xiaoming wang <[email protected]>
This code looks completely different in linux-next. Please redo on top of linux-next if it's still needed.
regards,
dan carpenter