Răsfoiți Sursa

drm/amdgpu: fix dereference before check

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Christian König 10 ani în urmă
părinte
comite
d919ad49ac
1 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 4 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+ 4 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

@@ -138,9 +138,9 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)
 int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
 int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
 		       struct amdgpu_ib *ibs, void *owner)
 		       struct amdgpu_ib *ibs, void *owner)
 {
 {
-	struct amdgpu_ring *ring;
-	struct amdgpu_vm *vm = ibs->vm;
 	struct amdgpu_ib *ib = &ibs[0];
 	struct amdgpu_ib *ib = &ibs[0];
+	struct amdgpu_ring *ring;
+	struct amdgpu_vm *vm;
 	unsigned i;
 	unsigned i;
 	int r = 0;
 	int r = 0;
 
 
@@ -148,6 +148,8 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
 		return -EINVAL;
 		return -EINVAL;
 
 
 	ring = ibs->ring;
 	ring = ibs->ring;
+	vm = ibs->vm;
+
 	if (!ring->ready) {
 	if (!ring->ready) {
 		dev_err(adev->dev, "couldn't schedule ib\n");
 		dev_err(adev->dev, "couldn't schedule ib\n");
 		return -EINVAL;
 		return -EINVAL;