* [PATCH] drm/msm/dpu: Add check for cstate
@ 2022-12-06 8:05 Jiasheng Jiang
2022-12-06 16:32 ` Abhinav Kumar
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jiasheng Jiang @ 2022-12-06 8:05 UTC (permalink / raw)
To: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied,
daniel, quic_jesszhan, ville.syrjala, yang.lee
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel, Jiasheng Jiang
As kzalloc may fail and return NULL pointer,
it should be better to check cstate
in order to avoid the NULL pointer dereference
in __drm_atomic_helper_crtc_reset.
Fixes: 1cff7440a86e ("drm/msm: Convert to using __drm_atomic_helper_crtc_reset() for reset.")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 13ce321283ff..22c2787b7b38 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -968,7 +968,10 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
dpu_crtc_destroy_state(crtc, crtc->state);
- __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
+ if (cstate)
+ __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
+ else
+ __drm_atomic_helper_crtc_reset(crtc, NULL);
}
/**
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/dpu: Add check for cstate
2022-12-06 8:05 [PATCH] drm/msm/dpu: Add check for cstate Jiasheng Jiang
@ 2022-12-06 16:32 ` Abhinav Kumar
2023-01-08 21:56 ` Dmitry Baryshkov
2023-01-26 19:01 ` Dmitry Baryshkov
2 siblings, 0 replies; 6+ messages in thread
From: Abhinav Kumar @ 2022-12-06 16:32 UTC (permalink / raw)
To: Jiasheng Jiang, robdclark, dmitry.baryshkov, sean, airlied,
daniel, quic_jesszhan, ville.syrjala, yang.lee
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
On 12/6/2022 12:05 AM, Jiasheng Jiang wrote:
> As kzalloc may fail and return NULL pointer,
> it should be better to check cstate
> in order to avoid the NULL pointer dereference
> in __drm_atomic_helper_crtc_reset.
You have wrapped around your lines too short. Please try to utilize the
full word limit for each line.
With that fixed,
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
>
> Fixes: 1cff7440a86e ("drm/msm: Convert to using __drm_atomic_helper_crtc_reset() for reset.")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 13ce321283ff..22c2787b7b38 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -968,7 +968,10 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
> if (crtc->state)
> dpu_crtc_destroy_state(crtc, crtc->state);
>
> - __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
> + if (cstate)
> + __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
> + else
> + __drm_atomic_helper_crtc_reset(crtc, NULL);
> }
>
> /**
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/dpu: Add check for cstate
2022-12-06 8:05 [PATCH] drm/msm/dpu: Add check for cstate Jiasheng Jiang
2022-12-06 16:32 ` Abhinav Kumar
@ 2023-01-08 21:56 ` Dmitry Baryshkov
2023-01-08 22:08 ` Dmitry Baryshkov
2023-01-26 19:01 ` Dmitry Baryshkov
2 siblings, 1 reply; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-01-08 21:56 UTC (permalink / raw)
To: Jiasheng Jiang, robdclark, quic_abhinavk, sean, airlied, daniel,
quic_jesszhan, ville.syrjala, yang.lee
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
On 06/12/2022 10:05, Jiasheng Jiang wrote:
> As kzalloc may fail and return NULL pointer,
> it should be better to check cstate
> in order to avoid the NULL pointer dereference
> in __drm_atomic_helper_crtc_reset.
>
> Fixes: 1cff7440a86e ("drm/msm: Convert to using __drm_atomic_helper_crtc_reset() for reset.")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 13ce321283ff..22c2787b7b38 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -968,7 +968,10 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
> if (crtc->state)
> dpu_crtc_destroy_state(crtc, crtc->state);
>
> - __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
> + if (cstate)
> + __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
> + else
> + __drm_atomic_helper_crtc_reset(crtc, NULL);
NAK.
The proper fix is to add the if() but to skip the else clause. We should
not reset the crtc's state if memory allocation failed.
> }
>
> /**
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/dpu: Add check for cstate
2023-01-08 21:56 ` Dmitry Baryshkov
@ 2023-01-08 22:08 ` Dmitry Baryshkov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-01-08 22:08 UTC (permalink / raw)
To: Jiasheng Jiang, robdclark, quic_abhinavk, sean, airlied, daniel,
quic_jesszhan, ville.syrjala, yang.lee
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
On 08/01/2023 23:56, Dmitry Baryshkov wrote:
> On 06/12/2022 10:05, Jiasheng Jiang wrote:
>> As kzalloc may fail and return NULL pointer,
>> it should be better to check cstate
>> in order to avoid the NULL pointer dereference
>> in __drm_atomic_helper_crtc_reset.
>>
>> Fixes: 1cff7440a86e ("drm/msm: Convert to using
>> __drm_atomic_helper_crtc_reset() for reset.")
>> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
>> ---
>> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> index 13ce321283ff..22c2787b7b38 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> @@ -968,7 +968,10 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
>> if (crtc->state)
>> dpu_crtc_destroy_state(crtc, crtc->state);
>> - __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
>> + if (cstate)
>> + __drm_atomic_helper_crtc_reset(crtc, &cstate->base);
>> + else
>> + __drm_atomic_helper_crtc_reset(crtc, NULL);
>
> NAK.
>
> The proper fix is to add the if() but to skip the else clause. We should
> not reset the crtc's state if memory allocation failed.
On the other hand... Some of the drivers do exactly this ops.
With the message fixed:
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/msm/dpu: Add check for cstate
2022-12-06 8:05 [PATCH] drm/msm/dpu: Add check for cstate Jiasheng Jiang
2022-12-06 16:32 ` Abhinav Kumar
2023-01-08 21:56 ` Dmitry Baryshkov
@ 2023-01-26 19:01 ` Dmitry Baryshkov
2 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-01-26 19:01 UTC (permalink / raw)
To: robdclark, quic_abhinavk, sean, airlied, daniel, quic_jesszhan,
ville.syrjala, yang.lee, Jiasheng Jiang
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
On Tue, 06 Dec 2022 16:05:17 +0800, Jiasheng Jiang wrote:
> As kzalloc may fail and return NULL pointer,
> it should be better to check cstate
> in order to avoid the NULL pointer dereference
> in __drm_atomic_helper_crtc_reset.
>
>
Applied, thanks!
[1/1] drm/msm/dpu: Add check for cstate
https://gitlab.freedesktop.org/lumag/msm/-/commit/c96988b7d993
Best regards,
--
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/msm/dpu: Add check for cstate
@ 2022-12-06 8:02 Jiasheng Jiang
0 siblings, 0 replies; 6+ messages in thread
From: Jiasheng Jiang @ 2022-12-06 8:02 UTC (permalink / raw)
To: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied,
daniel, quic_jesszhan, ville.syrjala, yang.lee
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel, Jiasheng Jiang
As kzalloc may fail and return NULL pointer,
it should be better to check pstates
in order to avoid the NULL pointer dereference
later.
Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 13ce321283ff..f51cb46ecfd6 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1150,6 +1150,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
bool needs_dirtyfb = dpu_crtc_needs_dirtyfb(crtc_state);
pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
+ if (!pstates)
+ return -ENOMEM;
if (!crtc_state->enable || !crtc_state->active) {
DRM_DEBUG_ATOMIC("crtc%d -> enable %d, active %d, skip atomic_check\n",
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-26 19:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-06 8:05 [PATCH] drm/msm/dpu: Add check for cstate Jiasheng Jiang
2022-12-06 16:32 ` Abhinav Kumar
2023-01-08 21:56 ` Dmitry Baryshkov
2023-01-08 22:08 ` Dmitry Baryshkov
2023-01-26 19:01 ` Dmitry Baryshkov
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 8:02 Jiasheng Jiang
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®