diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-04-10 05:15:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-04-10 05:18:10 +1000 |
| commit | d416bd0bf7efc733f80cbd9b1e387368965ef121 (patch) | |
| tree | 69e9ac0510e7b1da39ea95e5fb89a4d5252c38d7 /drivers/gpu/drm/xen/xen_drm_front.c | |
| parent | 2e99cd7a313a0d97b62ccf320c72ef70179dc3f3 (diff) | |
| parent | eb9dfdd1ed40357b99a4201c8534c58c562e48c9 (diff) | |
| download | linux-d416bd0bf7efc733f80cbd9b1e387368965ef121.tar.bz2 | |
Merge tag 'drm-misc-fixes-2021-04-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.12-rc7:
- Fix use-after-free in xen.
- Reduce fifo threshold on hvs4 to fix a fifo full error.
- Disable TE support for Droid4 and N950.
- Small compiler fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e7647dd9-60c3-9dfd-a377-89d717212e13@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/xen/xen_drm_front.c')
| -rw-r--r-- | drivers/gpu/drm/xen/xen_drm_front.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 30d9adf31c84..9f14d99c763c 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -521,7 +521,7 @@ static int xen_drm_drv_init(struct xen_drm_front_info *front_info) drm_dev = drm_dev_alloc(&xen_drm_driver, dev); if (IS_ERR(drm_dev)) { ret = PTR_ERR(drm_dev); - goto fail; + goto fail_dev; } drm_info->drm_dev = drm_dev; @@ -551,8 +551,10 @@ fail_modeset: drm_kms_helper_poll_fini(drm_dev); drm_mode_config_cleanup(drm_dev); drm_dev_put(drm_dev); -fail: +fail_dev: kfree(drm_info); + front_info->drm_info = NULL; +fail: return ret; } |