Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7dbc385 authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher
Browse files

amdgpu/dc: handle allocation failures in dc_commit_planes_to_stream. 



Reported-by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:966 dc_commit_planes_to_stream() error: potential null dereference 'flip_addr'.  (kcalloc returns null)
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:968 dc_commit_planes_to_stream() error: potential null dereference 'plane_info'.  (kcalloc returns null)
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:978 dc_commit_planes_to_stream() error: potential null dereference 'scaling_info'.  (kcalloc returns null)

Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bf5563ed

drivers/gpu/drm/amd/display/dc/core/dc.c

+8 −0
Original line number Diff line number Diff line
@@ -952,6 +952,14 @@ bool dc_commit_planes_to_stream( 
	scaling_info = kcalloc(MAX_SURFACES, sizeof(struct dc_scaling_info),

			       GFP_KERNEL);



	if (!flip_addr || !plane_info || !scaling_info) {

		kfree(flip_addr);

		kfree(plane_info);

		kfree(scaling_info);

		kfree(stream_update);

		return false;

	}



	memset(updates, 0, sizeof(updates));



	stream_update->src = dc_stream->src;