Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a0599dd authored Oct 30, 2013 by Jakob Bornecrantz Committed by Thomas Hellstrom Nov 06, 2013

drm/ttm: Handle in-memory region copies



Fix the case where the ttm pointer may be NULL causing
a NULL pointer dereference.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellström <thellstrom@vmware.com>
Cc: stable@vger.kernel.org

parent 15205fbc

drivers/gpu/drm/ttm/ttm_bo_util.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -348,7 +348,9 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
		if (old_iomap == NULL && ttm == NULL)
		goto out2;

		if (ttm->state == tt_unpopulated) {
		/* TTM might be null for moves within the same region.
		*/
		if (ttm && ttm->state == tt_unpopulated) {
		ret = ttm->bdev->driver->ttm_tt_populate(ttm);
		if (ret) {
		/* if we fail here don't nuke the mm node