vhost-user-scsi: Fix memleaks in vus_proc_req()
PATCH v2 1/1 vhost-user-scsi: Fix memleaks in vus_proc_req()
The 'elem' is allocated memory in vu_queue_pop(), and its memory should be freed in all error branches after vu_queue_pop().
In addition, in order to free the 'elem' memory outside of while(1) loop, move the definition of 'elem' to the beginning of vus_proc_req().
Reported-by Euler Robot <[email protected]>
Signed-off-by Alex Chen <[email protected]>
--- contrib/vhost-user-scsi/vhost-user-scsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
contrib/vhost-user-scsi/vhost-user-scsi.c +2 -1
@@ -232,6 +232,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)VugDev *gdev;VusDev *vdev_scsi;VuVirtq *vq; +VuVirtqElement *elem =NULL ;assert (vu_dev);
@@ -248,7 +249,6 @@ static void vus_proc_req(VuDev *vu_dev, int idx)g_debug ("Got kicked on vq[%d]@%p" , idx, vq);while (1 ) { -VuVirtqElement *elem;VirtIOSCSICmdReq *req;VirtIOSCSICmdResp *rsp;
@@ -288,6 +288,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)free (elem); } +free (elem); }static void vus_queue_set_started (VuDev *vu_dev,int idx,bool started)
Signature · 1 line
2.19.1
Sorry, I forgot to add the Reviewed-by information, I will send patch v3.
Quoted 40 lines · Alex Chen
The 'elem' is allocated memory in
vu_queue_pop(), and its memory should be freed in all error branches aftervu_queue_pop().
In addition, in order to free the 'elem' memory outside of while(1) loop, move the definition of 'elem' to the beginning ofvus_proc_req().Reported-by Euler Robot <[email protected]>Signed-off-by Alex Chen <[email protected]>--- contrib/vhost-user-scsi/vhost-user-scsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)contrib/vhost-user-scsi/vhost-user-scsi.c +2
-1@@ -232,6 +232,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)VugDev *gdev;VusDev *vdev_scsi;VuVirtq *vq; +VuVirtqElement *elem =NULL ;assert (vu_dev);@@ -248,7 +249,6 @@ static void vus_proc_req(VuDev *vu_dev, int idx)g_debug ("Got kicked on vq[%d]@%p" , idx, vq);while (1 ) { -VuVirtqElement *elem;VirtIOSCSICmdReq *req;VirtIOSCSICmdResp *rsp;@@ -288,6 +288,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)free (elem); } +free (elem); }static void vus_queue_set_started (VuDev *vu_dev,int idx,bool started)