From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D35A45C97 for ; Sun, 9 Oct 2022 22:20:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F301C433D7; Sun, 9 Oct 2022 22:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354034; bh=PsRNl2Dnj44JpC61qYoBTjVIFR761cattn6nyMPoyPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rR04FjE7yfQyFSW2PimJO1OoWZa+kZlA/+CUAsai5dbNqhoXEcSrxqtEg11yw83e6 8LNrj6eWjRMA6Tx2BpU0Rh1EMJKIPrE9R5wIpE8uwEUemJd49BLJ8wYZ8N3NihlMcf 7OK0Li9d6i2Z7YQod7DX1hpgUdV8m6RSdr9fbS5+ZNu2dve6Zn90Ed+701qqagLCMA VEHdEt3yQHgdvyNSkfq6Fm9AlfRJA23LUzLsld8DOVwA8p3GlFpHCMfWFWwoqV52oz hdCLGCuO6HKfOQxLrQRSkk+qzoZd/isnPPlDgYl4osjHQ4DFnM4b4rYgykGjIo6V1r UMK06xljQCyiA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, Nathan Chancellor , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, ndesaulniers@google.com, prabhakar.mahadev-lad.rj@bp.renesas.com, mkl@pengutronix.de, shayagr@amazon.com, chi.minghao@zte.com.cn, wsa+renesas@sang-engineering.com, bigunclemax@gmail.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 26/46] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Date: Sun, 9 Oct 2022 18:18:51 -0400 Message-Id: <20221009221912.1217372-26-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221912.1217372-1-sashal@kernel.org> References: <20221009221912.1217372-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Nathan Huckleberry [ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] The ndo_start_xmit field in net_device_ops is expected to be of type netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition. The return type of emac_dev_xmit should be changed from int to netdev_tx_t. Reported-by: Dan Carpenter Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Signed-off-by: Nathan Huckleberry Reviewed-by: Nathan Chancellor Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/davinci_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index d243ca5dfde0..4d3bd6e1db55 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -950,7 +950,7 @@ static void emac_tx_handler(void *token, int len, int status) * * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) */ -static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) { struct device *emac_dev = &ndev->dev; int ret_code; -- 2.35.1