| Message ID | 20220913205600.155172-1-nhuck@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: xlnx: Fix return type of zynqmp_dp_connector_mode_valid | expand |
On Tue, Sep 13, 2022 at 01:56:00PM -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 zynqmp_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/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 >
Hi Nathan, Thank you for the patch. On Tue, Sep 13, 2022 at 01:56:00PM -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 zynqmp_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> I'm not sure what forward edge kCFI is, but the fix looks good, so Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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;
Hi all, On Tue, Sep 13, 2022 at 01:56:00PM -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 zynqmp_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/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 > > Did this patch get lost somewhere? I do not see it picked up. It is needed to avoid a new WIP warning from clang for catching these CFI failures: drivers/gpu/drm/xlnx/zynqmp_dp.c:1396: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 = zynqmp_dp_connector_mode_valid, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Cheers, Nathan
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;
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@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/xlnx/zynqmp_dp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)