linux-kernel - Re: [PATCH] drm/mediatek: Test component initialization earlier in the function mtk_drm_crtc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAAOTY__vy0n_Sw+8a_4h7Er_qdt72x964Dc_uunLg88qx8wPGg@mail.gmail.com>
Date:   Mon, 9 Aug 2021 22:20:23 +0800
From:   Chun-Kuang Hu <chunkuang.hu@...nel.org>
To:     Dafna Hirschfeld <dafna.hirschfeld@...labora.com>
Cc:     DRI Development <dri-devel@...ts.freedesktop.org>,
        "moderated list:ARM/Mediatek SoC support" 
        <linux-mediatek@...ts.infradead.org>,
        linux-kernel <linux-kernel@...r.kernel.org>,
        Collabora Kernel ML <kernel@...labora.com>, dafna3@...il.com,
        Chun-Kuang Hu <chunkuang.hu@...nel.org>,
        Philipp Zabel <p.zabel@...gutronix.de>,
        David Airlie <airlied@...ux.ie>,
        Daniel Vetter <daniel@...ll.ch>,
        Enric Balletbo i Serra <enric.balletbo@...labora.com>,
        Laurent Pinchart <laurent.pinchart@...asonboard.com>
Subject: Re: [PATCH] drm/mediatek: Test component initialization earlier in
 the function mtk_drm_crtc_create

Hi, Dafna:

Dafna Hirschfeld <dafna.hirschfeld@...labora.com> 於 2021年7月13日 週二 上午2:12寫道：
>
> The initialization is currently tested in a later stage in
> the function for no reason.
> In addition, the test '!comp' will never fail since comp is
> set with the '&' operator. Instead, test if a comp was not
> initialized by testing "!comp->dev".

Applied to mediatek-drm-next [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Regards,
Chun-Kuang.

>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@...labora.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 474efb844249..06f40e589922 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -755,14 +755,22 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
>         for (i = 0; i < path_len; i++) {
>                 enum mtk_ddp_comp_id comp_id = path[i];
>                 struct device_node *node;
> +               struct mtk_ddp_comp *comp;
>
>                 node = priv->comp_node[comp_id];
> +               comp = &priv->ddp_comp[comp_id];
> +
>                 if (!node) {
>                         dev_info(dev,
>                                  "Not creating crtc %d because component %d is disabled or missing\n",
>                                  pipe, comp_id);
>                         return 0;
>                 }
> +
> +               if (!comp->dev) {
> +                       dev_err(dev, "Component %pOF not initialized\n", node);
> +                       return -ENODEV;
> +               }
>         }
>
>         mtk_crtc = devm_kzalloc(dev, sizeof(*mtk_crtc), GFP_KERNEL);
> @@ -787,16 +795,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
>         for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
>                 enum mtk_ddp_comp_id comp_id = path[i];
>                 struct mtk_ddp_comp *comp;
> -               struct device_node *node;
>
> -               node = priv->comp_node[comp_id];
>                 comp = &priv->ddp_comp[comp_id];
> -               if (!comp) {
> -                       dev_err(dev, "Component %pOF not initialized\n", node);
> -                       ret = -ENODEV;
> -                       return ret;
> -               }
> -
>                 mtk_crtc->ddp_comp[i] = comp;
>
>                 if (comp->funcs) {
> --
> 2.17.1
>