diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2009-07-21 17:45:13 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-29 07:56:04 +0200 |
| commit | 4677f15c60421d48566c48c3149474e64977f071 (patch) | |
| tree | 674c1099d98e0a6d441b9cb53d7e872bdf7136a0 | |
| parent | drm/radeon/kms: vram sizing on certain r100 chips needs workaround. (diff) | |
| download | linux-4677f15c60421d48566c48c3149474e64977f071.tar.xz linux-4677f15c60421d48566c48c3149474e64977f071.zip | |
drm/ttm: Fix an oops and sync object leak.
The code was potentially dereferencig a NULL sync object pointer.
At the same time a sync object reference was potentially leaked.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index bdec583901eb..3e5d0c4ad85c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -509,8 +509,8 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, if (evict) { ret = ttm_bo_wait(bo, false, false, false); spin_unlock(&bo->lock); - driver->sync_obj_unref(&bo->sync_obj); - + if (tmp_obj) + driver->sync_obj_unref(&tmp_obj); if (ret) return ret; @@ -532,6 +532,8 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, set_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags); spin_unlock(&bo->lock); + if (tmp_obj) + driver->sync_obj_unref(&tmp_obj); ret = ttm_buffer_object_transfer(bo, &ghost_obj); if (ret) |