Pull VFIO fixes from Alex Williamson: - Fix error path return value (Zhen Lei) - Add vfio-pci CONFIG_MMU dependency (Randy Dunlap) - Replace open coding with struct_size() (Gustavo A. R. Silva) - Fix sample driver error path (Wei Yongjun) - Fix vfio-platform error path module_put() (Max Gurtovoy) * tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio: vfio/platform: fix module_put call in error flow samples: vfio-mdev: fix error handing in mdpy_fb_probe() vfio/iommu_type1: Use struct_size() for kzalloc() vfio/pci: zap_vma_ptes() needs MMU vfio/pci: Fix error return code in vfio_ecap_init()
Showing the changes to samples (1 of 5 files). Show all
Unified · Split
| @@ -117,22 +117,27 @@ static int mdpy_fb_probe(struct pci_dev *pdev, · 116 unmodified lines | |||
| 117 | if (format != DRM_FORMAT_XRGB8888) { | 117 | if (format != DRM_FORMAT_XRGB8888) { |
| 118 | pci_err(pdev, "format mismatch (0x%x != 0x%x)\n", | 118 | pci_err(pdev, "format mismatch (0x%x != 0x%x)\n", |
| 119 | format, DRM_FORMAT_XRGB8888); | 119 | format, DRM_FORMAT_XRGB8888); |
| 120 | return -EINVAL; | 120 | ret = -EINVAL; |
| 121 | goto err_release_regions; | ||
| 121 | } | 122 | } |
| 122 | if (width < 100 || width > 10000) { | 123 | if (width < 100 || width > 10000) { |
| 123 | pci_err(pdev, "width (%d) out of range\n", width); | 124 | pci_err(pdev, "width (%d) out of range\n", width); |
| 124 | return -EINVAL; | 125 | ret = -EINVAL; |
| 126 | goto err_release_regions; | ||
| 125 | } | 127 | } |
| 126 | if (height < 100 || height > 10000) { | 128 | if (height < 100 || height > 10000) { |
| 127 | pci_err(pdev, "height (%d) out of range\n", height); | 129 | pci_err(pdev, "height (%d) out of range\n", height); |
| 128 | return -EINVAL; | 130 | ret = -EINVAL; |
| 131 | goto err_release_regions; | ||
| 129 | } | 132 | } |
| 130 | pci_info(pdev, "mdpy found: %dx%d framebuffer\n", | 133 | pci_info(pdev, "mdpy found: %dx%d framebuffer\n", |
| 131 | width, height); | 134 | width, height); |
| 132 | 135 | ||
| 133 | info = framebuffer_alloc(sizeof(struct mdpy_fb_par), &pdev->dev); | 136 | info = framebuffer_alloc(sizeof(struct mdpy_fb_par), &pdev->dev); |
| 134 | if (!info) | 137 | if (!info) { |
| 138 | ret = -ENOMEM; | ||
| 135 | goto err_release_regions; | 139 | goto err_release_regions; |
| 140 | } | ||
| 136 | pci_set_drvdata(pdev, info); | 141 | pci_set_drvdata(pdev, info); |
| 137 | par = info->par; | 142 | par = info->par; |
| 138 | 143 | ||