Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/meson: Fix return type of meson_encoder_cvbs_mode_valid()

With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG),
indirect call targets are validated against the expected function
pointer prototype to make sure the call target is valid to help mitigate
ROP attacks. If they are not identical, there is a failure at run time,
which manifests as either a kernel panic or thread getting killed. A
proposed warning in clang aims to catch these at compile time, which
reveals:

drivers/gpu/drm/meson/meson_encoder_cvbs.c:211:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_bridge *, const struct drm_display_info *, const struct drm_display_mode *)' with an expression of type 'int (struct drm_bridge *, const struct drm_display_info *, const struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = meson_encoder_cvbs_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

->mode_valid() in 'struct drm_bridge_funcs' expects a return type of
'enum drm_mode_status', not 'int'. Adjust the return type of
meson_encoder_cvbs_mode_valid() to match the prototype's to resolve the
warning and CFI failure.

Link: https://github.com/ClangBuiltLinux/linux/issues/1750
Reported-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221102155242.1927166-1-nathan@kernel.org

authored by

Nathan Chancellor and committed by
Neil Armstrong
6c4e4d35 ce28ab13

+4 -3
+4 -3
drivers/gpu/drm/meson/meson_encoder_cvbs.c
··· 116 116 return i; 117 117 } 118 118 119 - static int meson_encoder_cvbs_mode_valid(struct drm_bridge *bridge, 120 - const struct drm_display_info *display_info, 121 - const struct drm_display_mode *mode) 119 + static enum drm_mode_status 120 + meson_encoder_cvbs_mode_valid(struct drm_bridge *bridge, 121 + const struct drm_display_info *display_info, 122 + const struct drm_display_mode *mode) 122 123 { 123 124 if (meson_cvbs_get_mode(mode)) 124 125 return MODE_OK;