* [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
@ 2022-05-30 7:33 Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Haowen Bai @ 2022-05-30 7:33 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Dmitry Baryshkov, Sean Paul,
David Airlie, Daniel Vetter
Cc: Haowen Bai, linux-arm-msm, dri-devel, freedreno, linux-kernel
The ctx->hw is dereferencing before null checking, so move
it after checking.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
index bcccce292937..e59680cdd0ce 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
@@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb)
static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx,
struct dpu_hw_wb_qos_cfg *cfg)
{
- struct dpu_hw_blk_reg_map *c = &ctx->hw;
+ struct dpu_hw_blk_reg_map *c;
u32 qos_ctrl = 0;
if (!ctx || !cfg)
return;
+
+ c = &ctx->hw;
DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut);
DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut);
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 7:33 [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking Haowen Bai
@ 2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 0:36 ` Abhinav Kumar
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2022-05-30 21:49 UTC (permalink / raw)
To: Haowen Bai
Cc: Rob Clark, Abhinav Kumar, Sean Paul, David Airlie, Daniel Vetter,
linux-arm-msm, dri-devel, freedreno, linux-kernel
A nit: patchwork thinks that two patches from the same author with the
same subject are two versions of the same patch. In future, could you
please send such patches with distinct names? No need to send v2 now
unless review shows other issues with the patches.
On Mon, 30 May 2022 at 10:33, Haowen Bai <baihaowen@meizu.com> wrote:
>
> The ctx->hw is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 7:33 [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
@ 2022-05-31 0:36 ` Abhinav Kumar
2022-05-31 1:37 ` baihaowen
2022-05-31 1:34 ` baihaowen
2022-05-31 20:34 ` Rob Clark
3 siblings, 1 reply; 9+ messages in thread
From: Abhinav Kumar @ 2022-05-31 0:36 UTC (permalink / raw)
To: Haowen Bai, Rob Clark, Dmitry Baryshkov, Sean Paul, David Airlie,
Daniel Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
On 5/30/2022 12:33 AM, Haowen Bai wrote:
> The ctx->hw is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
Agree with Dmitry's comment. Adjust the patch subject to a different one
otherwise PW thinks they are same patches.
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> index bcccce292937..e59680cdd0ce 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> @@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb)
> static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx,
> struct dpu_hw_wb_qos_cfg *cfg)
> {
> - struct dpu_hw_blk_reg_map *c = &ctx->hw;
> + struct dpu_hw_blk_reg_map *c;
> u32 qos_ctrl = 0;
>
> if (!ctx || !cfg)
> return;
> +
> + c = &ctx->hw;
>
> DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut);
> DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut);
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-31 0:36 ` Abhinav Kumar
@ 2022-05-31 1:37 ` baihaowen
0 siblings, 0 replies; 9+ messages in thread
From: baihaowen @ 2022-05-31 1:37 UTC (permalink / raw)
To: Abhinav Kumar, Rob Clark, Dmitry Baryshkov, Sean Paul,
David Airlie, Daniel Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
在 2022/5/31 上午8:36, Abhinav Kumar 写道:
>
>
> On 5/30/2022 12:33 AM, Haowen Bai wrote:
>> The ctx->hw is dereferencing before null checking, so move
>> it after checking.
>>
>> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
>
> Agree with Dmitry's comment. Adjust the patch subject to a different one otherwise PW thinks they are same patches.
>
> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
>
>> ---
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
>> index bcccce292937..e59680cdd0ce 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
>> @@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb)
>> static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx,
>> struct dpu_hw_wb_qos_cfg *cfg)
>> {
>> - struct dpu_hw_blk_reg_map *c = &ctx->hw;
>> + struct dpu_hw_blk_reg_map *c;
>> u32 qos_ctrl = 0;
>> if (!ctx || !cfg)
>> return;
>> +
>> + c = &ctx->hw;
>> DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut);
>> DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut);
Sorry, plz ignore this patch.
ctx->hw is dereferenced, &ctx->hw is just a pointer math for pointer address offset, so it would not cause a bug(dereferencing null pointer).
--
Haowen Bai
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 7:33 [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 0:36 ` Abhinav Kumar
@ 2022-05-31 1:34 ` baihaowen
2022-05-31 20:34 ` Rob Clark
3 siblings, 0 replies; 9+ messages in thread
From: baihaowen @ 2022-05-31 1:34 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Dmitry Baryshkov, Sean Paul,
David Airlie, Daniel Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
在 2022/5/30 下午3:33, Haowen Bai 写道:
> The ctx->hw is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> index bcccce292937..e59680cdd0ce 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> @@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb)
> static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx,
> struct dpu_hw_wb_qos_cfg *cfg)
> {
> - struct dpu_hw_blk_reg_map *c = &ctx->hw;
> + struct dpu_hw_blk_reg_map *c;
> u32 qos_ctrl = 0;
>
> if (!ctx || !cfg)
> return;
> +
> + c = &ctx->hw;
>
> DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut);
> DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut);
Sorry, plz ignore this patch.
ctx->hw is dereferenced, &ctx->hw is just a pointer math for pointer address offset, so it would not cause a bug(dereferencing null pointer).
--
Haowen Bai
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 7:33 [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking Haowen Bai
` (2 preceding siblings ...)
2022-05-31 1:34 ` baihaowen
@ 2022-05-31 20:34 ` Rob Clark
3 siblings, 0 replies; 9+ messages in thread
From: Rob Clark @ 2022-05-31 20:34 UTC (permalink / raw)
To: Haowen Bai
Cc: Abhinav Kumar, Dmitry Baryshkov, Sean Paul, David Airlie,
Daniel Vetter, linux-arm-msm, dri-devel, freedreno,
Linux Kernel Mailing List
On Mon, May 30, 2022 at 12:34 AM Haowen Bai <baihaowen@meizu.com> wrote:
>
> The ctx->hw is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> index bcccce292937..e59680cdd0ce 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> @@ -155,11 +155,13 @@ static void dpu_hw_wb_roi(struct dpu_hw_wb *ctx, struct dpu_hw_wb_cfg *wb)
> static void dpu_hw_wb_setup_qos_lut(struct dpu_hw_wb *ctx,
> struct dpu_hw_wb_qos_cfg *cfg)
> {
> - struct dpu_hw_blk_reg_map *c = &ctx->hw;
> + struct dpu_hw_blk_reg_map *c;
> u32 qos_ctrl = 0;
>
> if (!ctx || !cfg)
> return;
> +
> + c = &ctx->hw;
tbh, we should just drop both of these null checks.. there is no
codepath that can reach this with potential for either param to be
NULL
BR,
-R
>
> DPU_REG_WRITE(c, WB_DANGER_LUT, cfg->danger_lut);
> DPU_REG_WRITE(c, WB_SAFE_LUT, cfg->safe_lut);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
@ 2022-05-30 2:19 Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 17:51 ` Abhinav Kumar
0 siblings, 2 replies; 9+ messages in thread
From: Haowen Bai @ 2022-05-30 2:19 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Dmitry Baryshkov, Sean Paul,
David Airlie, Daniel Vetter
Cc: Haowen Bai, linux-arm-msm, dri-devel, freedreno, linux-kernel
The phys_enc->wb_idx is dereferencing before null checking, so move
it after checking.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
index 4829d1ce0cf8..59da348ff339 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
@@ -574,11 +574,11 @@ static void dpu_encoder_phys_wb_disable(struct dpu_encoder_phys *phys_enc)
*/
static void dpu_encoder_phys_wb_destroy(struct dpu_encoder_phys *phys_enc)
{
- DPU_DEBUG("[wb:%d]\n", phys_enc->wb_idx - WB_0);
-
if (!phys_enc)
return;
+ DPU_DEBUG("[wb:%d]\n", phys_enc->wb_idx - WB_0);
+
kfree(phys_enc);
}
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 2:19 Haowen Bai
@ 2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 17:51 ` Abhinav Kumar
1 sibling, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2022-05-30 21:49 UTC (permalink / raw)
To: Haowen Bai
Cc: Rob Clark, Abhinav Kumar, Sean Paul, David Airlie, Daniel Vetter,
linux-arm-msm, dri-devel, freedreno, linux-kernel
On Mon, 30 May 2022 at 05:20, Haowen Bai <baihaowen@meizu.com> wrote:
>
> The phys_enc->wb_idx is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking
2022-05-30 2:19 Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
@ 2022-05-31 17:51 ` Abhinav Kumar
1 sibling, 0 replies; 9+ messages in thread
From: Abhinav Kumar @ 2022-05-31 17:51 UTC (permalink / raw)
To: Haowen Bai, Rob Clark, Dmitry Baryshkov, Sean Paul, David Airlie,
Daniel Vetter
Cc: linux-arm-msm, freedreno, linux-kernel, dri-devel
On 5/29/2022 7:19 PM, Haowen Bai wrote:
> The phys_enc->wb_idx is dereferencing before null checking, so move
> it after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
Fixes: d7d0e73f7de33 ("drm/msm/dpu: introduce the dpu_encoder_phys_* for
writeback")
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> index 4829d1ce0cf8..59da348ff339 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> @@ -574,11 +574,11 @@ static void dpu_encoder_phys_wb_disable(struct dpu_encoder_phys *phys_enc)
> */
> static void dpu_encoder_phys_wb_destroy(struct dpu_encoder_phys *phys_enc)
> {
> - DPU_DEBUG("[wb:%d]\n", phys_enc->wb_idx - WB_0);
> -
> if (!phys_enc)
> return;
>
> + DPU_DEBUG("[wb:%d]\n", phys_enc->wb_idx - WB_0);
> +
> kfree(phys_enc);
> }
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-05-31 20:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-30 7:33 [PATCH] drm/msm/dpu: Fix pointer dereferenced before checking Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 0:36 ` Abhinav Kumar
2022-05-31 1:37 ` baihaowen
2022-05-31 1:34 ` baihaowen
2022-05-31 20:34 ` Rob Clark
-- strict thread matches above, loose matches on Subject: below --
2022-05-30 2:19 Haowen Bai
2022-05-30 21:49 ` Dmitry Baryshkov
2022-05-31 17:51 ` Abhinav Kumar
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®