lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 132/141] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
    Date
    From: Nathan Huckleberry <nhuck@google.com>

    [ Upstream commit b0b9408f132623dc88e78adb5282f74e4b64bb57 ]

    The mode_valid field in drm_connector_helper_funcs is expected to be of
    type:
    enum drm_mode_status (* mode_valid) (struct drm_connector *connector,
    struct drm_display_mode *mode);

    The mismatched return type breaks forward edge kCFI since the underlying
    function definition does not match the function hook definition.

    The return type of cdn_dp_connector_mode_valid should be changed from
    int to enum drm_mode_status.

    Reported-by: Dan Carpenter <error27@gmail.com>
    Link: https://github.com/ClangBuiltLinux/linux/issues/1703
    Cc: llvm@lists.linux.dev
    Signed-off-by: Nathan Huckleberry <nhuck@google.com>
    Reviewed-by: Nathan Chancellor <nathan@kernel.org>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220913205555.155149-1-nhuck@google.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
    index dec54c70e008..857c47c69ef1 100644
    --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
    +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
    @@ -276,8 +276,9 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
    return ret;
    }

    -static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
    - struct drm_display_mode *mode)
    +static enum drm_mode_status
    +cdn_dp_connector_mode_valid(struct drm_connector *connector,
    + struct drm_display_mode *mode)
    {
    struct cdn_dp_device *dp = connector_to_dp(connector);
    struct drm_display_info *display_info = &dp->connector.display_info;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:12    [W:2.197 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site