drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation
authorRoy Spliet <nouveau@spliet.org>
Tue, 7 Apr 2020 17:07:37 +0000 (18:07 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jun 2020 13:32:57 +0000 (15:32 +0200)
[ Upstream commit e4337877c5d578722c0716f131fb774522013cf5 ]

When allocation for mdp5_kms fails, calling mdp5_destroy() leads to undefined
behaviour, likely a nullptr exception or use-after-free troubles.

Signed-off-by: Roy Spliet <nouveau@spliet.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

index bddd625ab91bd44a56824c3e30a8ea2edefe46ff..25691b7cece150cc696b55cb098a684eb5bc4edd 100644 (file)
@@ -1021,7 +1021,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)
 
        return 0;
 fail:
-       mdp5_destroy(pdev);
+       if (mdp5_kms)
+               mdp5_destroy(pdev);
        return ret;
 }