diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-10-12 02:17:30 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-13 18:25:50 -0400 |
commit | eeb2fa0c97ba661f8b7fb210a1de10928b67a47b (patch) | |
tree | 3c194552a9b4ce732788d8486e2fa846bd1adae4 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
parent | 9faa6b0277fab4ab91db4d69bc47566fdfbae48b (diff) |
drm/amdgpu: potential NULL dereference in debugfs code
debugfs_create_file() returns NULL on error, it only returns error
pointers if debugfs isn't enabled in the config and we checked for that
earlier so it can't happen.
Fixes: 4f4824b55650 ('drm/amd/amdgpu: Convert ring debugfs entries to binary')
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index e1fa8731d1e2..3cb5e903cd62 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |||
@@ -345,8 +345,8 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev, | |||
345 | ent = debugfs_create_file(name, | 345 | ent = debugfs_create_file(name, |
346 | S_IFREG | S_IRUGO, root, | 346 | S_IFREG | S_IRUGO, root, |
347 | ring, &amdgpu_debugfs_ring_fops); | 347 | ring, &amdgpu_debugfs_ring_fops); |
348 | if (IS_ERR(ent)) | 348 | if (!ent) |
349 | return PTR_ERR(ent); | 349 | return -ENOMEM; |
350 | 350 | ||
351 | i_size_write(ent->d_inode, ring->ring_size + 12); | 351 | i_size_write(ent->d_inode, ring->ring_size + 12); |
352 | ring->ent = ent; | 352 | ring->ent = ent; |