projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ae49154
)
Merge tag 'vmwgfx-fixes-4.3-151014' of git://people.freedesktop.org/~thomash/linux...
author
Dave Airlie
<airlied@redhat.com>
Thu, 15 Oct 2015 22:10:21 +0000
(08:10 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 15 Oct 2015 22:10:21 +0000
(08:10 +1000)
Pull request of 2015-10-14
* tag 'vmwgfx-fixes-4.3-151014' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Fix kernel NULL pointer dereference on older hardware
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 64b50409fa0749558844cf561aac983e36197241..03f63c749c02333f412c82184f20def8ce1d8d74 100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@
-657,7
+657,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);
}