Commit fa161995 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-fixes-signed-20210402' of... 

Merge tag 'hyperv-fixes-signed-20210402' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull Hyper-V fixes from Wei Liu:
 "One fix from Lu Yunlong for a double free in hvfb_probe"

* tag 'hyperv-fixes-signed-20210402' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  video: hyperv_fb: Fix a double free in hvfb_probe
parents f5664825 37df9f3f

drivers/video/fbdev/hyperv_fb.c

+0 −3
Original line number Diff line number Diff line
@@ -1031,7 +1031,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) 
			PCI_DEVICE_ID_HYPERV_VIDEO, NULL);

		if (!pdev) {

			pr_err("Unable to find PCI Hyper-V video\n");

			kfree(info->apertures);

			return -ENODEV;

		}
@@ -1129,7 +1128,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) 
	} else {

		pci_dev_put(pdev);

	}

	kfree(info->apertures);



	return 0;
@@ -1141,7 +1139,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) 
err1:

	if (!gen2vm)

		pci_dev_put(pdev);

	kfree(info->apertures);



	return -ENOMEM;

}