* [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
@ 2022-09-13 20:55 Nathan Huckleberry
2022-09-13 23:20 ` Nathan Chancellor
2022-09-14 9:27 ` Heiko Stuebner
0 siblings, 2 replies; 3+ messages in thread
From: Nathan Huckleberry @ 2022-09-13 20:55 UTC (permalink / raw)
Cc: linux-kernel, David Airlie, Tom Rix, llvm, Nick Desaulniers,
Sandy Huang, dri-devel, Nathan Huckleberry, Nathan Chancellor,
linux-rockchip, linux-arm-kernel, Dan Carpenter
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>
---
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 c204e9b95c1f..518ee13b1d6f 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -283,8 +283,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.37.2.789.g6183377224-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
2022-09-13 20:55 [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid Nathan Huckleberry
@ 2022-09-13 23:20 ` Nathan Chancellor
2022-09-14 9:27 ` Heiko Stuebner
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2022-09-13 23:20 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: David Airlie, Tom Rix, llvm, Nick Desaulniers, Sandy Huang,
dri-devel, linux-kernel, linux-rockchip, linux-arm-kernel,
Dan Carpenter
On Tue, Sep 13, 2022 at 01:55:55PM -0700, Nathan Huckleberry wrote:
> 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>
> ---
> 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 c204e9b95c1f..518ee13b1d6f 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -283,8 +283,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.37.2.789.g6183377224-goog
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
2022-09-13 20:55 [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid Nathan Huckleberry
2022-09-13 23:20 ` Nathan Chancellor
@ 2022-09-14 9:27 ` Heiko Stuebner
1 sibling, 0 replies; 3+ messages in thread
From: Heiko Stuebner @ 2022-09-14 9:27 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: David Airlie, Tom Rix, llvm, Nick Desaulniers, linux-kernel,
dri-devel, Sandy Huang, Nathan Chancellor, linux-rockchip,
linux-arm-kernel, Dan Carpenter
On Tue, 13 Sep 2022 13:55:55 -0700, Nathan Huckleberry wrote:
> 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.
>
> [...]
Applied, thanks!
[1/1] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
commit: b0b9408f132623dc88e78adb5282f74e4b64bb57
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-14 9:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-13 20:55 [PATCH] drm/rockchip: Fix return type of cdn_dp_connector_mode_valid Nathan Huckleberry
2022-09-13 23:20 ` Nathan Chancellor
2022-09-14 9:27 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).