Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp6094053rwb; Mon, 14 Nov 2022 14:18:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5SU9Kw1Gzb96Nx1/TKWjGwZoFb6K4PPX0aGGsVous95rDE/f8XSKQorT5Eocm2lik+5c2z X-Received: by 2002:a17:906:4d13:b0:78d:dddb:3974 with SMTP id r19-20020a1709064d1300b0078ddddb3974mr11414890eju.411.1668464321799; Mon, 14 Nov 2022 14:18:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668464321; cv=none; d=google.com; s=arc-20160816; b=GFcP1JGW1UGyfMYS5JzGLobWTjaDekgshKR7TqCfq/UkUNCVHaTwgG7YRkBNR0v/Qd kDTNXysr/LJXfPSghffcXXVBqGxGIbmAF2Uc1dWKSMOXCi4bpWIi5vcOpklM79oKox3j Xo6U0I6++H0MpQs7osFxiI7DNxIazfcuLitK5VLrIhBhXDtbeBtxyRxBXTFv2f8LYOJR Toc0rvU00QkxmaMMpG3s9z6gD9mkTBcZ0kHYA+NHzEJ6pEfeCDPZ+MJvQFpaZwPRp8b5 eGK9iZofsbpl8RCLLZLgR8lw+azIr4PaCKwKqYeh+IpPGrHoxCZL2r4jXcjlroIANuaT 9QsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=4xANklRcsUz52F+rS3xBrk+B6HdfoPlJwUPyHXuF30Y=; b=jiJMOyu7t/DCjmtL01t2GjsMlhBD58H+RDaojwFAD9g4z+P3Ocau+uXlRypeWXxLQI ZsEDRxBJlbR5TeHzBJVQQ0ndTuDkAgyQ7Xz+aC4x+bVdBL0LdgCbj3vww2NFUWUK9zPO txRcJtSReyRzCQRoZXDIgv/ARItqzvVYlXYtyh2UVwIRVBILll4EoD5telumgmEqzaIk Joy2TWONWAwi8cPbo837W1iElBTAZDl15NcH8iaywK8AOLMQCSS4eo0HQOD6U0fJdx4J e1KDOTrKxSzPOilFxwXa4bdCXmfJisGEFPSDNH9+qaQbF0QgmCpOEn/BiQpcTN7kfRH2 I3bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=l3ePceob; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a056402274200b004617e8811c4si11486232edd.28.2022.11.14.14.18.19; Mon, 14 Nov 2022 14:18:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=l3ePceob; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237268AbiKNWDM (ORCPT + 88 others); Mon, 14 Nov 2022 17:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235639AbiKNWDJ (ORCPT ); Mon, 14 Nov 2022 17:03:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9105319C36 for ; Mon, 14 Nov 2022 14:03:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1D53661483 for ; Mon, 14 Nov 2022 22:03:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7C72C433C1; Mon, 14 Nov 2022 22:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668463387; bh=xYf9S1SoJjidkD4jKsy+Wuq5ZNiGrhRfm8O+wo77syE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l3ePceobY6nyivcZMmUGudcVYrlsg/3EXws/XpBIS7a5XcMT0y67Oz/g56ed5U4NT G2oJEToHGrx2JfaBNw9W8tDVmqDwtfmxQnG0Ym2milI+MV6nbJ70QyAe91hfzyJ5Ld 7ESuvU4Lov6wmRCR0mhTE56U88kCWA6B9SQdQorHfHV45tC9gw0YVwFPKd6E6uW61h ZPptAdJt6sofngivPa2SPpg2hI/weJgfoDh2GZJnDxxDL3zwizU07C2IaqkIAhmP+d YnXzWEzlIjI+TCDerTQNsDvSH7NCJU46bNzh/tBXu7HJQQIz+rqnp9Hit57yxEl3wc /T2pVFrr6DrSw== Date: Mon, 14 Nov 2022 15:03:05 -0700 From: Nathan Chancellor To: Stefan Agner , Alison Wang Cc: dri-devel@lists.freedesktop.org, Nick Desaulniers , Tom Rix , Kees Cook , Sami Tolvanen , llvm@lists.linux.dev, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: Re: [PATCH] drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() Message-ID: References: <20221102154215.78059-1-nathan@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221102154215.78059-1-nathan@kernel.org> X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Wed, Nov 02, 2022 at 08:42:15AM -0700, Nathan Chancellor wrote: > 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/fsl-dcu/fsl_dcu_drm_rgb.c:74: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 = fsl_dcu_drm_connector_mode_valid, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > ->mode_valid() in 'struct drm_connector_helper_funcs' expects a return > type of 'enum drm_mode_status', not 'int'. Adjust the return type of > fsl_dcu_drm_connector_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 > Signed-off-by: Nathan Chancellor > --- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > index 4d4a715b429d..2c2b92324a2e 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > @@ -60,8 +60,9 @@ static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector) > return drm_panel_get_modes(fsl_connector->panel, connector); > } > > -static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector, > - struct drm_display_mode *mode) > +static enum drm_mode_status > +fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector, > + struct drm_display_mode *mode) > { > if (mode->hdisplay & 0xf) > return MODE_ERROR; > > base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780 > -- > 2.38.1 > > Could someone please pick this up so that it makes 6.2? We would like to try and get this warning turned on so that it can catch more potential run time issues at compile time but that can only happen when all the warnings are fixed. Cheers, Nathan