Skip to content

Commit 55c91fe

Browse files
Wolfram Sangmstsirkin
authored andcommitted
virtio-mmio: don't break lifecycle of vm_dev
vm_dev has a separate lifecycle because it has a 'struct device' embedded. Thus, having a release callback for it is correct. Allocating the vm_dev struct with devres totally breaks this protection, though. Instead of waiting for the vm_dev release callback, the memory is freed when the platform_device is removed. Resulting in a use-after-free when finally the callback is to be called. To easily see the problem, compile the kernel with CONFIG_DEBUG_KOBJECT_RELEASE and unbind with sysfs. The fix is easy, don't use devres in this case. Found during my research about object lifetime problems. Fixes: 7eb781b ("virtio_mmio: add cleanup for virtio_mmio_probe") Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Message-Id: <20230629120526.7184-1-wsa+renesas@sang-engineering.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 52a93d3 commit 55c91fe

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/virtio/virtio_mmio.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,9 +607,8 @@ static void virtio_mmio_release_dev(struct device *_d)
607607
struct virtio_device *vdev =
608608
container_of(_d, struct virtio_device, dev);
609609
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
610-
struct platform_device *pdev = vm_dev->pdev;
611610

612-
devm_kfree(&pdev->dev, vm_dev);
611+
kfree(vm_dev);
613612
}
614613

615614
/* Platform device */
@@ -620,7 +619,7 @@ static int virtio_mmio_probe(struct platform_device *pdev)
620619
unsigned long magic;
621620
int rc;
622621

623-
vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL);
622+
vm_dev = kzalloc(sizeof(*vm_dev), GFP_KERNEL);
624623
if (!vm_dev)
625624
return -ENOMEM;
626625

0 commit comments

Comments
 (0)