diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2015-10-12 01:49:39 -0700 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-28 10:33:12 +0000 |
| commit | fd3a964b3ccb088f6d3eacc9c261de8d5e8a206c (patch) | |
| tree | 735acd41a55ba8a6cedd10003bf408d349cb8c2a /drivers/gpu | |
| parent | 2efdc7e54ef82975d9d776ee1259498aad652709 (diff) | |
drm/vmwgfx: Fix kernel NULL pointer dereference on older hardware
commit ed7d78b2da32198ca4c70172e3b63c6b3e2c570b upstream.
The commit "drm/vmwgfx: Fix up user_dmabuf refcounting", while fixing a
kernel crash introduced a NULL pointer dereference on older hardware.
Fix this.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 9e190db6cc37..17a4107639b2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -653,7 +653,8 @@ static void vmw_user_surface_base_release(struct ttm_base_object **p_base) struct vmw_resource *res = &user_srf->srf.res; *p_base = NULL; - ttm_base_object_unref(&user_srf->backup_base); + if (user_srf->backup_base) + ttm_base_object_unref(&user_srf->backup_base); vmw_resource_unreference(&res); } |