aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-09-14 06:08:06 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 08:52:22 -0800
commit8215014c1d9d78ef14260a46ee2a136acc3d283a (patch)
tree44740b61c1d11da7e2ce989a8876b88444d1d8be
parent6d7f52a7e695b4a6d2ba32e477d283626bfbec00 (diff)
downloadkernel_samsung_aries-8215014c1d9d78ef14260a46ee2a136acc3d283a.zip
kernel_samsung_aries-8215014c1d9d78ef14260a46ee2a136acc3d283a.tar.gz
kernel_samsung_aries-8215014c1d9d78ef14260a46ee2a136acc3d283a.tar.bz2
drm/ttm: request zeroed system memory pages for new TT buffer objects
commit ff02b13f6867af72682d7a9bb9bd705f9af2bab0 upstream. Fixes an information leak to userspace, we were handing out un-zeroed pages for any newly created TTM_PL_TT buffer. Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e2b2d78..81b6850 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -394,7 +394,8 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED)) {
if (bo->ttm == NULL) {
- ret = ttm_bo_add_ttm(bo, false);
+ bool zero = !(old_man->flags & TTM_MEMTYPE_FLAG_FIXED);
+ ret = ttm_bo_add_ttm(bo, zero);
if (ret)
goto out_err;
}