[PATCH] drm: xlnx: Fix return type of zynqmp_dp_connector_mode_valid

Nathan Huckleberry nhuck at google.com
Tue Sep 13 13:56:00 PDT 2022


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 zynqmp_dp_connector_mode_valid should be changed from
int to enum drm_mode_status.

Reported-by: Dan Carpenter <error27 at gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm at lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck at google.com>
---
 drivers/gpu/drm/xlnx/zynqmp_dp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
index d14612b34796..f571b08d23d3 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
@@ -1352,8 +1352,9 @@ zynqmp_dp_connector_best_encoder(struct drm_connector *connector)
 	return &dp->encoder;
 }
 
-static int zynqmp_dp_connector_mode_valid(struct drm_connector *connector,
-					  struct drm_display_mode *mode)
+static enum drm_mode_status
+zynqmp_dp_connector_mode_valid(struct drm_connector *connector,
+			       struct drm_display_mode *mode)
 {
 	struct zynqmp_dp *dp = connector_to_dp(connector);
 	u8 max_lanes = dp->link_config.max_lanes;
-- 
2.37.2.789.g6183377224-goog




More information about the linux-arm-kernel mailing list