diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 09:26:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 09:26:42 -0800 |
| commit | 282c183b0207a518bb3be1b65faa5a36d1529fa0 (patch) | |
| tree | 5de1d3d56b54940871995b7cec628bb861fdc135 | |
| parent | dda9cc3a14518fcf8a89faef15f0f704de3533f2 (diff) | |
| parent | 1b28c3e628315ac0d9ef2d3fac0403f05ae692db (diff) | |
| download | linux-282c183b0207a518bb3be1b65faa5a36d1529fa0.tar.bz2 | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm qxl leak fix from Dave Airlie:
"As usual 5 mins after I send a trivial pull fix I find a real bug!
This fixes a memory leak and I'd like to get it into stable queue
asap"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/qxl: fix memory leak in release list handling
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_release.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 0109a9644cb2..821ab7b9409b 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -92,6 +92,7 @@ qxl_release_free(struct qxl_device *qdev, - DRM_FILE_OFFSET); qxl_fence_remove_release(&bo->fence, release->id); qxl_bo_unref(&bo); + kfree(entry); } spin_lock(&qdev->release_idr_lock); idr_remove(&qdev->release_idr, release->id); |