]> Pileus Git - ~andy/linux/commitdiff
drm/radeon/vm: don't attempt to update ptes if ib allocation fails
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 13 Nov 2013 20:25:35 +0000 (15:25 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 15 Nov 2013 20:56:22 +0000 (15:56 -0500)
If we fail to allocate an indirect buffer (ib) when updating
the ptes, return an error instead of trying to use the ib.
Avoids a null pointer dereference.

Bug:
https://bugzilla.kernel.org/show_bug.cgi?id=58621

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_gart.c

index cd7489b4d70982ff3f461b59ce974c743d9a2259..3044e504f4ec9a8a4cbf6ef18bbd009fe7672c01 100644 (file)
@@ -1209,6 +1209,8 @@ int radeon_vm_bo_update_pte(struct radeon_device *rdev,
                return -ENOMEM;
 
        r = radeon_ib_get(rdev, R600_RING_TYPE_DMA_INDEX, &ib, NULL, ndw * 4);
+       if (r)
+               return r;
        ib.length_dw = 0;
 
        r = radeon_vm_update_pdes(rdev, vm, &ib, bo_va->soffset, bo_va->eoffset);