Commit 752774ce authored by Wei Yongjun's avatar Wei Yongjun Committed by Alex Williamson
Browse files

samples: vfio-mdev: fix error handing in mdpy_fb_probe() 



Fix to return a negative error code from the framebuffer_alloc() error
handling case instead of 0, also release regions in some error handing
cases.

Fixes: cacade19 ("sample: vfio mdev display - guest driver")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Message-Id: <20210520133641.1421378-1-weiyongjun1@huawei.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 78b23814

samples/vfio-mdev/mdpy-fb.c

+9 −4
Original line number Diff line number Diff line
@@ -117,22 +117,27 @@ static int mdpy_fb_probe(struct pci_dev *pdev, 
	if (format != DRM_FORMAT_XRGB8888) {

		pci_err(pdev, "format mismatch (0x%x != 0x%x)\n",

			format, DRM_FORMAT_XRGB8888);

		return -EINVAL;

		ret = -EINVAL;

		goto err_release_regions;

	}

	if (width < 100	 || width > 10000) {

		pci_err(pdev, "width (%d) out of range\n", width);

		return -EINVAL;

		ret = -EINVAL;

		goto err_release_regions;

	}

	if (height < 100 || height > 10000) {

		pci_err(pdev, "height (%d) out of range\n", height);

		return -EINVAL;

		ret = -EINVAL;

		goto err_release_regions;

	}

	pci_info(pdev, "mdpy found: %dx%d framebuffer\n",

		 width, height);



	info = framebuffer_alloc(sizeof(struct mdpy_fb_par), &pdev->dev);

	if (!info)

	if (!info) {

		ret = -ENOMEM;

		goto err_release_regions;

	}

	pci_set_drvdata(pdev, info);

	par = info->par;