Skip to content

Commit 9e0f4f2

Browse files
dtorawilliam
authored andcommitted
kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add()
kvm_vfio_group_add() creates kvg instance, links it to kv->group_list, and calls kvm_vfio_file_set_kvm() with kvg->file as an argument after dropping kv->lock. If we race group addition and deletion calls, kvg instance may get freed by the time we get around to calling kvm_vfio_file_set_kvm(). Previous iterations of the code did not reference kvg->file outside of the critical section, but used a temporary variable. Still, they had similar problem of the file reference being owned by kvg structure and potential for kvm_vfio_group_del() dropping it before kvm_vfio_group_add() had a chance to complete. Fix this by moving call to kvm_vfio_file_set_kvm() under the protection of kv->lock. We already call it while holding the same lock when vfio group is being deleted, so it should be safe here as well. Fixes: 2fc1bec ("kvm: set/clear kvm to/from vfio_group when group add/delete") Reviewed-by: Alex Williamson <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alex Williamson <[email protected]>
1 parent 0946713 commit 9e0f4f2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

virt/kvm/vfio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ static int kvm_vfio_file_add(struct kvm_device *dev, unsigned int fd)
180180
list_add_tail(&kvf->node, &kv->file_list);
181181

182182
kvm_arch_start_assignment(dev->kvm);
183+
kvm_vfio_file_set_kvm(kvf->file, dev->kvm);
183184

184185
mutex_unlock(&kv->lock);
185186

186-
kvm_vfio_file_set_kvm(kvf->file, dev->kvm);
187187
kvm_vfio_update_coherency(dev);
188188

189189
return 0;

0 commit comments

Comments
 (0)