From: Dave Airlie Date: Tue, 3 May 2016 02:44:29 +0000 (+1000) Subject: drm/amdgpu: set metadata pointer to NULL after freeing. X-Git-Tag: v4.6-rc7~17^2~1^2~2 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=0092d3edcb23fcdb8cbe4159ba94a534290ff982;p=cascardo%2Flinux.git drm/amdgpu: set metadata pointer to NULL after freeing. Without this there was a double free of the metadata, which ended up freeing the fd table for me here, and taking out the machine more often than not. I reproduced with X.org + modesetting DDX + latest llvm/mesa, also required using dri3. Cc: stable@vger.kernel.org Reviewed-by: Christian König Signed-off-by: Dave Airlie Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index e557fc1f17c8..7ecea83ce453 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -541,6 +541,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata, if (!metadata_size) { if (bo->metadata_size) { kfree(bo->metadata); + bo->metadata = NULL; bo->metadata_size = 0; } return 0;