Skip to contentSkip to conversation

drm/amdgpu: check for allocation failure in amdgpu_vkms_sw_init()

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 6, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: check for allocation failure in amdgpu_vkms_sw_init()

Check whether the kcalloc() fails and return -ENOMEM if it does.

Fixes eeba0b9046fc ("drm/amdgpu: create amdgpu_vkms (v4)")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +2 -0
index 50bdc39733aa..ce982afeff91 100644
@@ -482,6 +482,8 @@ static int amdgpu_vkms_sw_init(void *handle)
 		return r;
 
 	adev->amdgpu_vkms_output = kcalloc(adev->mode_info.num_crtc, sizeof(struct amdgpu_vkms_output), GFP_KERNEL);
+	if (!adev->amdgpu_vkms_output)
+		return -ENOMEM;
 
 	/* allocate crtcs, encoders, connectors */
 	for (i = 0; i < adev->mode_info.num_crtc; i++) {
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Am 06.08.21 um 17:05 schrieb Dan Carpenter:

Quoted 4 lines

Check whether the kcalloc() fails and return -ENOMEM if it does.

Fixes eeba0b9046fc ("drm/amdgpu: create amdgpu_vkms (v4)")

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c static int amdgpu_vkms_sw_init(void *handle) · line 484

Quoted 12 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +0 -0
index 50bdc39733aa..ce982afeff91 100644
@@ -482,6 +482,8 @@ static int amdgpu_vkms_sw_init(void *handle)
  		return r;
 
  	adev->amdgpu_vkms_output = kcalloc(adev->mode_info.num_crtc, sizeof(struct amdgpu_vkms_output), GFP_KERNEL);

Is the line above not a bit long?

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +2 -0
+	if (!adev->amdgpu_vkms_output)
+		return -ENOMEM;
 
  	/* allocate crtcs, encoders, connectors */
  	for (i = 0; i < adev->mode_info.num_crtc; i++) {
Applied
#2 lore raw

Applied. Thanks!

Alex

Quoted 30 lines · Christian König

Am 06.08.21 um 17:05 schrieb Dan Carpenter:

Quoted 4 lines

Check whether the kcalloc() fails and return -ENOMEM if it does.

Fixes eeba0b9046fc ("drm/amdgpu: create amdgpu_vkms (v4)")

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c static int amdgpu_vkms_sw_init(void *handle) · line 484

Quoted 12 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +0 -0
index 50bdc39733aa..ce982afeff91 100644
@@ -482,6 +482,8 @@ static int amdgpu_vkms_sw_init(void *handle)
              return r;
 
      adev->amdgpu_vkms_output = kcalloc(adev->mode_info.num_crtc, sizeof(struct amdgpu_vkms_output), GFP_KERNEL);

Is the line above not a bit long?

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +2 -0
+     if (!adev->amdgpu_vkms_output)
+             return -ENOMEM;
 
      /* allocate crtcs, encoders, connectors */
      for (i = 0; i < adev->mode_info.num_crtc; i++) {