microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

virtio_balloon: Fix memory leaks on errors in virtballoon_probe() 

We forget to put the inode and unmount the kernfs used for compaction.

Fixes: 71994620bb ("virtio_balloon: replace oom notifier with shrinker")
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Liang Li <liang.z.li@intel.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20200205163402.42627-3-david@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
David Hildenbrand 2020-02-05 17:34:01 +01:00 коммит произвёл Michael S. Tsirkin
Родитель 6c22dc61c7
Коммит 1ad6f58ea9
1 изменённых файлов: 9 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
drivers/virtio/virtio_balloon.c
Просмотреть файл

@ -903,8 +903,7 @@ static int virtballoon_probe(struct virtio_device *vdev)
vb->vb_dev_info.inode = alloc_anon_inode(balloon_mnt->mnt_sb); vb->vb_dev_info.inode = alloc_anon_inode(balloon_mnt->mnt_sb);
if (IS_ERR(vb->vb_dev_info.inode)) { if (IS_ERR(vb->vb_dev_info.inode)) {
err = PTR_ERR(vb->vb_dev_info.inode); err = PTR_ERR(vb->vb_dev_info.inode);
kern_unmount(balloon_mnt); goto out_kern_unmount;
goto out_del_vqs;
} }
vb->vb_dev_info.inode->i_mapping->a_ops = &balloon_aops; vb->vb_dev_info.inode->i_mapping->a_ops = &balloon_aops;
#endif #endif
@ -915,13 +914,13 @@ static int virtballoon_probe(struct virtio_device *vdev)
*/ */
if (virtqueue_get_vring_size(vb->free_page_vq) < 2) { if (virtqueue_get_vring_size(vb->free_page_vq) < 2) {
err = -ENOSPC; err = -ENOSPC;
goto out_del_vqs; goto out_iput;
} }
vb->balloon_wq = alloc_workqueue("balloon-wq", vb->balloon_wq = alloc_workqueue("balloon-wq",
WQ_FREEZABLE | WQ_CPU_INTENSIVE, 0); WQ_FREEZABLE | WQ_CPU_INTENSIVE, 0);
if (!vb->balloon_wq) { if (!vb->balloon_wq) {
err = -ENOMEM; err = -ENOMEM;
goto out_del_vqs; goto out_iput;
} }
INIT_WORK(&vb->report_free_page_work, report_free_page_func); INIT_WORK(&vb->report_free_page_work, report_free_page_func);
vb->cmd_id_received_cache = VIRTIO_BALLOON_CMD_ID_STOP; vb->cmd_id_received_cache = VIRTIO_BALLOON_CMD_ID_STOP;
@ -955,6 +954,12 @@ static int virtballoon_probe(struct virtio_device *vdev)
out_del_balloon_wq: out_del_balloon_wq:
if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
destroy_workqueue(vb->balloon_wq); destroy_workqueue(vb->balloon_wq);
out_iput:
#ifdef CONFIG_BALLOON_COMPACTION
iput(vb->vb_dev_info.inode);
out_kern_unmount:
kern_unmount(balloon_mnt);
#endif
out_del_vqs: out_del_vqs:
vdev->config->del_vqs(vdev); vdev->config->del_vqs(vdev);
out_free_vb: out_free_vb: