Skip to content

Commit 46b4604

Browse files
nathanchanceintel-lab-lkp
authored andcommitted
drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_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/sti/sti_hda.c:637:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict] .mode_valid = sti_hda_connector_mode_valid, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sti/sti_dvo.c:376:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict] .mode_valid = sti_dvo_connector_mode_valid, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sti/sti_hdmi.c:1035:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict] .mode_valid = sti_hdmi_connector_mode_valid, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ->mode_valid() in 'struct drm_connector_helper_funcs' expects a return type of 'enum drm_mode_status', not 'int'. Adjust the return type of sti_{dvo,hda,hdmi}_connector_mode_valid() to match the prototype's to resolve the warning and CFI failure. Link: ClangBuiltLinux#1750 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent 9abf231 commit 46b4604

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

drivers/gpu/drm/sti/sti_dvo.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,9 @@ static int sti_dvo_connector_get_modes(struct drm_connector *connector)
346346

347347
#define CLK_TOLERANCE_HZ 50
348348

349-
static int sti_dvo_connector_mode_valid(struct drm_connector *connector,
350-
struct drm_display_mode *mode)
349+
static enum drm_mode_status
350+
sti_dvo_connector_mode_valid(struct drm_connector *connector,
351+
struct drm_display_mode *mode)
351352
{
352353
int target = mode->clock * 1000;
353354
int target_min = target - CLK_TOLERANCE_HZ;

drivers/gpu/drm/sti/sti_hda.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,9 @@ static int sti_hda_connector_get_modes(struct drm_connector *connector)
601601

602602
#define CLK_TOLERANCE_HZ 50
603603

604-
static int sti_hda_connector_mode_valid(struct drm_connector *connector,
605-
struct drm_display_mode *mode)
604+
static enum drm_mode_status
605+
sti_hda_connector_mode_valid(struct drm_connector *connector,
606+
struct drm_display_mode *mode)
606607
{
607608
int target = mode->clock * 1000;
608609
int target_min = target - CLK_TOLERANCE_HZ;

drivers/gpu/drm/sti/sti_hdmi.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,9 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
10041004

10051005
#define CLK_TOLERANCE_HZ 50
10061006

1007-
static int sti_hdmi_connector_mode_valid(struct drm_connector *connector,
1008-
struct drm_display_mode *mode)
1007+
static enum drm_mode_status
1008+
sti_hdmi_connector_mode_valid(struct drm_connector *connector,
1009+
struct drm_display_mode *mode)
10091010
{
10101011
int target = mode->clock * 1000;
10111012
int target_min = target - CLK_TOLERANCE_HZ;

0 commit comments

Comments
 (0)