drm/meson: Fix return type of meson_encoder_cvbs_mode_valid()
PATCH 1/1 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.
--- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/meson/meson_encoder_cvbs.c +4 -3
@@ -116,9 +116,10 @@ static int meson_encoder_cvbs_get_modes(struct drm_bridge *bridge,return i; } -static int meson_encoder_cvbs_mode_valid (struct drm_bridge *bridge, -const struct drm_display_info *display_info, -const struct drm_display_mode *mode) +static enum drm_mode_status +meson_encoder_cvbs_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *display_info, +const struct drm_display_mode *mode) {if (meson_cvbs_get_mode (mode))return MODE_OK ;
base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780
Signature · 1 line
2.38.1
Quoted 13 lines · Nathan Chancellor
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 'enumdrm_mode_status(*)(structdrm_bridge*, const structdrm_display_info*, const structdrm_display_mode*)' with an expression of type 'int (structdrm_bridge*, const structdrm_display_info*, const structdrm_display_mode*)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid =meson_encoder_cvbs_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Quoted 8 lines
->mode_valid() in 'struct
drm_bridge_funcs' expects a return type of 'enumdrm_mode_status', not 'int'. Adjust the return type ofmeson_encoder_cvbs_mode_valid()to match the prototype's to resolve the warning and CFI failure.Reported-by Sami Tolvanen <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Signature · 1 line
Kees Cook
Hi,
Quoted 9 lines · Nathan Chancellor
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:[...]
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)
[1/1] drm/meson: Fix return type of meson_encoder_cvbs_mode_valid()
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=6c4e4d35203301906afb53c6d1e1302d4c793c05
Signature · 1 line
Neil