* [PATCH] drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init()
@ 2021-10-04 13:45 Dan Carpenter
2021-10-04 23:32 ` Dmitry Baryshkov
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-10-04 13:45 UTC (permalink / raw)
To: Rob Clark, Jordan Crouse, Jonathan Marek
Cc: Sean Paul, David Airlie, Daniel Vetter, Eric Anholt,
Viresh Kumar, Akhil P Oommen, Bjorn Andersson, linux-arm-msm,
dri-devel, freedreno, kernel-janitors
There are two problems here:
1) The "seqptr" is used uninitalized when we free it at the end.
2) The a6xx_gmu_get_mmio() function returns error pointers. It never
returns true.
Fixes: 64245fc55172 ("drm/msm/a6xx: use AOP-initialized PDC for a650")
Fixes: f8fc924e088e ("drm/msm/a6xx: Fix PDC register overlap")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index a7c58018959f..3bd6e579ea89 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -512,11 +512,11 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
struct platform_device *pdev = to_platform_device(gmu->dev);
void __iomem *pdcptr = a6xx_gmu_get_mmio(pdev, "gmu_pdc");
- void __iomem *seqptr;
+ void __iomem *seqptr = NULL;
uint32_t pdc_address_offset;
bool pdc_in_aop = false;
- if (!pdcptr)
+ if (IS_ERR(pdcptr))
goto err;
if (adreno_is_a650(adreno_gpu) || adreno_is_a660_family(adreno_gpu))
@@ -528,7 +528,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
if (!pdc_in_aop) {
seqptr = a6xx_gmu_get_mmio(pdev, "gmu_pdc_seq");
- if (!seqptr)
+ if (IS_ERR(seqptr))
goto err;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init()
2021-10-04 13:45 [PATCH] drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init() Dan Carpenter
@ 2021-10-04 23:32 ` Dmitry Baryshkov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Baryshkov @ 2021-10-04 23:32 UTC (permalink / raw)
To: Dan Carpenter, Rob Clark, Jordan Crouse, Jonathan Marek
Cc: Sean Paul, David Airlie, Daniel Vetter, Eric Anholt,
Viresh Kumar, Akhil P Oommen, Bjorn Andersson, linux-arm-msm,
dri-devel, freedreno, kernel-janitors
On 04/10/2021 16:45, Dan Carpenter wrote:
> There are two problems here:
> 1) The "seqptr" is used uninitalized when we free it at the end.
This looks like a nice catch, potentially causing troubles.
> 2) The a6xx_gmu_get_mmio() function returns error pointers. It never
> returns true.
>
> Fixes: 64245fc55172 ("drm/msm/a6xx: use AOP-initialized PDC for a650")
> Fixes: f8fc924e088e ("drm/msm/a6xx: Fix PDC register overlap")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> index a7c58018959f..3bd6e579ea89 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> @@ -512,11 +512,11 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
> struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
> struct platform_device *pdev = to_platform_device(gmu->dev);
> void __iomem *pdcptr = a6xx_gmu_get_mmio(pdev, "gmu_pdc");
> - void __iomem *seqptr;
> + void __iomem *seqptr = NULL;
> uint32_t pdc_address_offset;
> bool pdc_in_aop = false;
>
> - if (!pdcptr)
> + if (IS_ERR(pdcptr))
> goto err;
>
> if (adreno_is_a650(adreno_gpu) || adreno_is_a660_family(adreno_gpu))
> @@ -528,7 +528,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
>
> if (!pdc_in_aop) {
> seqptr = a6xx_gmu_get_mmio(pdev, "gmu_pdc_seq");
> - if (!seqptr)
> + if (IS_ERR(seqptr))
> goto err;
> }
>
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-04 23:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-04 13:45 [PATCH] drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init() Dan Carpenter
2021-10-04 23:32 ` Dmitry Baryshkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).