Skip to contentSkip to conversation

drm/amdgpu: potential NULL dereference in debugfs code

PATCH Applied Dan Carpenter 3 participants 3 messages Oct 12, 2016

Subsystems (3)
DRM drivers Kernel janitors Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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')
Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -2
index 85aeb0a..8d16eaf 100644
@@ -371,8 +371,8 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
 	ent = debugfs_create_file(name,
 				  S_IFREG | S_IRUGO, root,
 				  ring, &amdgpu_debugfs_ring_fops);
-	if (IS_ERR(ent))
-		return PTR_ERR(ent);
+	if (!ent)
+		return -ENOMEM;
 
 	i_size_write(ent->d_inode, ring->ring_size + 12);
 	ring->ent = ent;
maintainer Reviewed-by on v1 1/1
#1 lore raw

Am 12.10.2016 um 08:17 schrieb Dan Carpenter:

Quoted 6 lines

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')
Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Christian König <[email protected]>.
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0 -0
index 85aeb0a..8d16eaf 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev, · line 378

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -2
@@ -371,8 +371,8 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
  	ent = debugfs_create_file(name,
  				  S_IFREG | S_IRUGO, root,
  				  ring, &amdgpu_debugfs_ring_fops);
-	if (IS_ERR(ent))
-		return PTR_ERR(ent);
+	if (!ent)
+		return -ENOMEM;
 
  	i_size_write(ent->d_inode, ring->ring_size + 12);
  	ring->ent = ent;

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#2 lore raw
Quoted 6 lines · Christian König

Am 12.10.2016 um 08:17 schrieb Dan Carpenter:

Quoted 5 lines

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.

Quoted 7 lines
Quoted 3 lines
Fixes 4f4824b55650 ('drm/amd/amdgpu: Convert ring debugfs entries to

binary')

Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Christian König <[email protected]>.

Applied. thanks!

Alex

Quoted 25 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0 -0
index 85aeb0a..8d16eaf 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static int amdgpu_debugfs_ring_init(struct · line 378

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -2
@@ -371,8 +371,8 @@ static int amdgpu_debugfs_ring_init(struct
 amdgpu_device *adev,
        ent = debugfs_create_file(name,
                                  S_IFREG | S_IRUGO, root,
                                  ring, &amdgpu_debugfs_ring_fops);
-       if (IS_ERR(ent))
-               return PTR_ERR(ent);
+       if (!ent)
+               return -ENOMEM;
        i_size_write(ent->d_inode, ring->ring_size + 12);
        ring->ent = ent;

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel