diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 19:42:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 19:42:20 +0200 |
| commit | fa16199500c8863da145870f01d61617d967b6c3 (patch) | |
| tree | 1039b30fb3edd34f2912909a7188963f7831da4e | |
| parent | Merge tag 'driver-core-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | video: hyperv_fb: Fix a double free in hvfb_probe (diff) | |
| download | linux-fa16199500c8863da145870f01d61617d967b6c3.tar.xz linux-fa16199500c8863da145870f01d61617d967b6c3.zip | |
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
| -rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index c8b0ae676809..4dc9077dd2ac 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -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 @@ getmem_done: } else { pci_dev_put(pdev); } - kfree(info->apertures); return 0; @@ -1141,7 +1139,6 @@ err2: err1: if (!gen2vm) pci_dev_put(pdev); - kfree(info->apertures); return -ENOMEM; } |