The a6xx_destroy() function frees "a6xx_gpu" and so "adreno_gpu" points
to freed memory.  Preserve the error code before freeing the memory to
avoid a use after free.

Fixes: d158886cba08 ("drm/msm/adreno: Trust the SSoT UBWC config")
Signed-off-by: Dan Carpenter <[email protected]>
---
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c 
b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 8b3bb2fd433b..a44380316aaa 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -2770,8 +2770,9 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_device 
*dev)
 
        adreno_gpu->ubwc_config = qcom_ubwc_config_get_data();
        if (IS_ERR(adreno_gpu->ubwc_config)) {
+               ret = PTR_ERR(adreno_gpu->ubwc_config);
                a6xx_destroy(&(a6xx_gpu->base.base));
-               return ERR_CAST(adreno_gpu->ubwc_config);
+               return ERR_PTR(ret);
        }
 
        /* Set up the preemption specific bits and pieces for each ringbuffer */
-- 
2.53.0

Reply via email to