* [PATCH] drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params
@ 2025-02-24 6:32 Ma Ke
2025-02-25 22:53 ` Alex Hung
0 siblings, 1 reply; 2+ messages in thread
From: Ma Ke @ 2025-02-24 6:32 UTC (permalink / raw)
To: harry.wentland, sunpeng.li, Rodrigo.Siqueira, alexander.deucher,
christian.koenig, Xinhui.Pan, airlied, simona, wenjing.liu,
alex.hung, dillon.varone, Samson.Tam, yi-lchen, chris.park,
aurabindo.pillai, george.shen, gabe.teeger, Yihan.Zhu,
Tony.Cheng
Cc: amd-gfx, dri-devel, linux-kernel, Ma Ke, stable
Null pointer dereference issue could occur when pipe_ctx->plane_state
is null. The fix adds a check to ensure 'pipe_ctx->plane_state' is not
null before accessing. This prevents a null pointer dereference.
Found by code review.
Cc: stable@vger.kernel.org
Fixes: 3be5262e353b ("drm/amd/display: Rename more dc_surface stuff to plane_state")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 520a34a42827..88e8ae63a07f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1452,6 +1452,9 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
struct scaling_taps temp = {0};
bool res = false;
+ if (!plane_state)
+ return false;
+
DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
/* Invalid input */
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params
2025-02-24 6:32 [PATCH] drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params Ma Ke
@ 2025-02-25 22:53 ` Alex Hung
0 siblings, 0 replies; 2+ messages in thread
From: Alex Hung @ 2025-02-25 22:53 UTC (permalink / raw)
To: Ma Ke, harry.wentland, sunpeng.li, Rodrigo.Siqueira,
alexander.deucher, christian.koenig, Xinhui.Pan, airlied, simona,
wenjing.liu, dillon.varone, Samson.Tam, yi-lchen, chris.park,
aurabindo.pillai, george.shen, gabe.teeger, Yihan.Zhu,
Tony.Cheng
Cc: amd-gfx, dri-devel, linux-kernel, stable
On 2/23/25 23:32, Ma Ke wrote:
> Null pointer dereference issue could occur when pipe_ctx->plane_state
> is null. The fix adds a check to ensure 'pipe_ctx->plane_state' is not
> null before accessing. This prevents a null pointer dereference.
>
> Found by code review.
>
> Cc: stable@vger.kernel.org
> Fixes: 3be5262e353b ("drm/amd/display: Rename more dc_surface stuff to plane_state")
> Signed-off-by: Ma Ke <make24@iscas.ac.cn>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index 520a34a42827..88e8ae63a07f 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -1452,6 +1452,9 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
> struct scaling_taps temp = {0};
> bool res = false;
>
> + if (!plane_state)
> + return false;
> +
This if statement can be merged with the following one such as below,
and it also allows ASSERT to kick in instead of failing silently.
DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
/* Invalid input */
- if (!plane_state->dst_rect.width ||
- !plane_state->dst_rect.height ||
- !plane_state->src_rect.width ||
- !plane_state->src_rect.height) {
+ if (!plane_state ||
+ !plane_state->dst_rect.width ||
+ !plane_state->dst_rect.height ||
+ !plane_state->src_rect.width ||
+ !plane_state->src_rect.height) {
ASSERT(0);
> DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
>
> /* Invalid input */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-25 22:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-24 6:32 [PATCH] drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params Ma Ke
2025-02-25 22:53 ` Alex Hung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®