]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/msm/mdp5: Add check for kzalloc
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Tue, 6 Dec 2022 07:48:19 +0000 (15:48 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:43:46 +0000 (16:43 +0100)
[ Upstream commit 13fcfcb2a9a4787fe4e49841d728f6f2e9fa6911 ]

As kzalloc may fail and return NULL pointer,
it should be better to check the return value
in order to avoid the NULL pointer dereference.

Fixes: 4c09bbc3bb6c ("drm/msm: Convert to using __drm_atomic_helper_crtc_reset() for reset.")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/514154/
Link: https://lore.kernel.org/r/20221206074819.18134-1-jiasheng@iscas.ac.cn
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

index 03d60eb0925772a57ec72c5c415b33da9d20c8c2..cc60842b47e99afccfe1d08b065d967be23226d1 100644 (file)
@@ -1050,7 +1050,10 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc)
        if (crtc->state)
                mdp5_crtc_destroy_state(crtc, crtc->state);
 
-       __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base);
+       if (mdp5_cstate)
+               __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base);
+       else
+               __drm_atomic_helper_crtc_reset(crtc, NULL);
 
        drm_crtc_vblank_reset(crtc);
 }