drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 4 Nov 2015 13:25:09 +0000 (16:25 +0300)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 4 Nov 2015 17:29:21 +0000 (12:29 -0500)
We recently changed the locking in this function and now there is a
missing unlock on error.  Also there are some other resources that we
should probably release as well...

Fixes: f48b2659f521 ('drm/amdgpu: fix the broken vm->mutex V2')
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

index 8727c30..233ac9c 100644 (file)
@@ -875,8 +875,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                struct amdgpu_job *job;
                struct amdgpu_ring * ring =  parser->ibs->ring;
                job = kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL);
-               if (!job)
-                       return -ENOMEM;
+               if (!job) {
+                       r = -ENOMEM;
+                       goto out;
+               }
                job->base.sched = &ring->sched;
                job->base.s_entity = &parser->ctx->rings[ring->idx].entity;
                job->adev = parser->adev;