vhost-scsi: serialize completion notification with callfd updates
Subsystems (6)
PATCH v2 1/1 vhost-scsi: serialize completion notification with callfd updates
vhost_scsi_complete_cmd_work() drops the virtqueue mutex before calling vhost_signal(). VHOST_SET_VRING_CALL replaces call_ctx.ctx and releases the old eventfd_ctx while holding the same mutex. vhost_signal() reads the call context before and after vhost_notify(), so a concurrent callfd update can make it signal a freed context or NULL.
KASAN reported the use through:
eventfd_signal_mask
vhost_signal
vhost_scsi_complete_cmd_work
The context was released through:
eventfd_ctx_put
vhost_vring_ioctl
vhost_scsi_ioctl
Keep the mutex held through vhost_signal() so completion notification and callfd updates are serialized.
---
Changes since RFC:
- Send as a non-RFC v2.
- Add Fixes and Link tags.
drivers/vhost/scsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/vhost/scsi.c +1 -2
@@ -735,10 +735,9 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)vhost_scsi_release_cmd_res (se_cmd); } -mutex_unlock (&svq->vq.mutex); -if (signal)vhost_signal (&svq->vs->dev, &svq->vq); +mutex_unlock (&svq->vq.mutex); } static struct vhost_scsi_cmd *
Signature · 1 line
2.34.1
Quoted 24 lines · Jia Jia
vhost_scsi_complete_cmd_work()drops the virtqueue mutex before callingvhost_signal().VHOST_SET_VRING_CALLreplaces call_ctx.ctx and releases the oldeventfd_ctxwhile holding the same mutex.vhost_signal()reads the call context before and aftervhost_notify(), so a concurrent callfd update can make it signal a freed context or NULL.KASAN reported the use through:
eventfd_signal_mask
vhost_signal
vhost_scsi_complete_cmd_workThe context was released through:
eventfd_ctx_put
vhost_vring_ioctl
vhost_scsi_ioctlKeep the mutex held through
vhost_signal()so completion notification and callfd updates are serialized.Fixes 057cbf49a1f0 ("tcm_vhost: Initial merge for vhost level target fabric driver")Signed-off-by Jia Jia <[email protected]>
Quoted 7 lines
---
Changes since RFC:
- Send as a non-RFC v2.
- Add Fixes and Link tags.drivers/vhost/scsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)