lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 367/717] drm/mediatek: avoid dereferencing a null hdmi_phy on an error message
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit b097efba9580d1f7cbc80cda84e768983e3de541 ]

    Currently there is a null pointer check for hdmi_phy that implies it
    may be null, however a dev_err messages dereferences this potential null
    pointer. Avoid a null pointer dereference by only emitting the dev_err
    message if hdmi_phy is non-null. It is a moot point if the error message
    needs to be printed at all, but since this is a relatively new piece of
    code it may be useful to keep the message in for the moment in case there
    are unforseen errors that need to be reported.

    Fixes: be28b6507c46 ("drm/mediatek: separate hdmi phy to different file")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Addresses-Coverity: ("Dereference after null check")
    Link: https://lore.kernel.org/r/20201207150937.170435-1-colin.king@canonical.com
    [vkoul: fix indent of return call]
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/mediatek/phy-mtk-hdmi.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/phy/mediatek/phy-mtk-hdmi.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
    index 47c029d4b270b..206cc34687223 100644
    --- a/drivers/phy/mediatek/phy-mtk-hdmi.c
    +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
    @@ -84,8 +84,9 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)
    hdmi_phy->conf->hdmi_phy_disable_tmds)
    return &mtk_hdmi_phy_dev_ops;

    - dev_err(hdmi_phy->dev, "Failed to get dev ops of phy\n");
    - return NULL;
    + if (hdmi_phy)
    + dev_err(hdmi_phy->dev, "Failed to get dev ops of phy\n");
    + return NULL;
    }

    static void mtk_hdmi_phy_clk_get_data(struct mtk_hdmi_phy *hdmi_phy,
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:56    [W:4.159 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site