Nicholas A. Bellinger
2012-Jul-05 04:14 UTC
[PATCH] tcm_vhost: Fix tv_cmd completion -> release SGL memory leak
From: Nicholas Bellinger <nab at linux-iscsi.org> The SGL memory allocated during vhost_scsi_map_iov_to_sgl() setup was never getting freed during tv_cmd completion -> release path. Fix this up by releasing tv_cmd->tvc_sgl in vhost_scsi_free_cmd() ahead of tv_cmd descriptor free. Cc: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com> Cc: Zhi Yong Wu <wuzhy at cn.ibm.com> Cc: Michael S. Tsirkin <mst at redhat.com> Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org> --- drivers/vhost/tcm_vhost.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/vhost/tcm_vhost.c b/drivers/vhost/tcm_vhost.c index cd86633..9692153 100644 --- a/drivers/vhost/tcm_vhost.c +++ b/drivers/vhost/tcm_vhost.c @@ -387,6 +387,8 @@ static void vhost_scsi_free_cmd(struct tcm_vhost_cmd *tv_cmd) u32 i; for (i = 0; i < tv_cmd->tvc_sgl_count; i++) put_page(sg_page(&tv_cmd->tvc_sgl[i])); + + kfree(tv_cmd->tvc_sgl); } kfree(tv_cmd); -- 1.7.2.5
Zhi Yong Wu
2012-Jul-05 05:24 UTC
[PATCH] tcm_vhost: Fix tv_cmd completion -> release SGL memory leak
On Thu, 2012-07-05 at 04:14 +0000, Nicholas A. Bellinger wrote:> From: Nicholas Bellinger <nab at linux-iscsi.org> > > The SGL memory allocated during vhost_scsi_map_iov_to_sgl() setup was never > getting freed during tv_cmd completion -> release path. Fix this up by releasing > tv_cmd->tvc_sgl in vhost_scsi_free_cmd() ahead of tv_cmd descriptor free. > > Cc: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com> > Cc: Zhi Yong Wu <wuzhy at cn.ibm.com> > Cc: Michael S. Tsirkin <mst at redhat.com> > Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org> > --- > drivers/vhost/tcm_vhost.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/vhost/tcm_vhost.c b/drivers/vhost/tcm_vhost.c > index cd86633..9692153 100644 > --- a/drivers/vhost/tcm_vhost.c > +++ b/drivers/vhost/tcm_vhost.c > @@ -387,6 +387,8 @@ static void vhost_scsi_free_cmd(struct tcm_vhost_cmd *tv_cmd) > u32 i; > for (i = 0; i < tv_cmd->tvc_sgl_count; i++) > put_page(sg_page(&tv_cmd->tvc_sgl[i])); > + > + kfree(tv_cmd->tvc_sgl); > } > > kfree(tv_cmd);Reviewed-by: Zhi Yong Wu <wuzhy at linux.vnet.ibm.com> -- Regards, Zhi Yong Wu