Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea206cf authored by Asias He's avatar Asias He Committed by Nicholas Bellinger
Browse files

tcm_vhost: Fix tv_cmd leak in vhost_scsi_handle_vq 



If we fail to submit the allocated tv_vmd to tcm_vhost_submission_work,
we will leak the tv_vmd. Free tv_vmd on fail path.

Signed-off-by: default avatarAsias He <asias@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent f6da51c3

drivers/vhost/tcm_vhost.c

+7 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs, 
				" exceeds SCSI_MAX_VARLEN_CDB_SIZE: %d\n",

				scsi_command_size(tv_cmd->tvc_cdb),

				TCM_VHOST_MAX_CDB_SIZE);

			break; /* TODO */

			goto err;

		}

		tv_cmd->tvc_lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF;
@@ -737,7 +737,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs, 
					data_direction == DMA_TO_DEVICE);

			if (unlikely(ret)) {

				vq_err(vq, "Failed to map iov to sgl\n");

				break; /* TODO */

				goto err;

			}

		}
@@ -758,6 +758,11 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs, 
	}



	mutex_unlock(&vq->mutex);

	return;



err:

	vhost_scsi_free_cmd(tv_cmd);

	mutex_unlock(&vq->mutex);

}



static void vhost_scsi_ctl_handle_kick(struct vhost_work *work)