lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-mmio: don't break lifecycle of vm_dev

Browse Source 
[ Upstream commit 55c91fedd03d7b9cf0c5199b2eb12b9b8e95281a ]

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: 7eb781b1bb ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wolfram Sang 2023-06-29 14:05:26 +02:00 committed by Greg Kroah-Hartman
parent e22a4b77b6
commit b788ad3b24
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/virtio/virtio_mmio.c
View File

@ -543,9 +543,8 @@ static void virtio_mmio_release_dev(struct device *_d)
struct virtio_device *vdev = struct virtio_device *vdev =
container_of(_d, struct virtio_device, dev); container_of(_d, struct virtio_device, dev);
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
struct platform_device *pdev = vm_dev->pdev;
devm_kfree(&pdev->dev, vm_dev); kfree(vm_dev);
} }
/* Platform device */ /* Platform device */
@ -556,7 +555,7 @@ static int virtio_mmio_probe(struct platform_device *pdev)
unsigned long magic; unsigned long magic;
int rc; int rc;
vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL); vm_dev = kzalloc(sizeof(*vm_dev), GFP_KERNEL);
if (!vm_dev) if (!vm_dev)
return -ENOMEM; return -ENOMEM;