From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D6C7C433F5 for ; Sun, 9 Oct 2022 22:50:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233259AbiJIWus (ORCPT ); Sun, 9 Oct 2022 18:50:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233155AbiJIWtn (ORCPT ); Sun, 9 Oct 2022 18:49:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76C9445F47; Sun, 9 Oct 2022 15:26:01 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 9AA65B80DD4; Sun, 9 Oct 2022 22:23:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59652C433C1; Sun, 9 Oct 2022 22:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354231; bh=CZxDqO3ZdwGsbtJSi3dwrars4sfBH0axnpz3JL0XgT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C1K9kmdAFuorhRtKUmq8ffJUQO8woKkLOKsP5TzmR6Nf3EoCQ8GERhFV81LFF+PBf /xT+GA71WMgC8X1qJulLyRDHP6IOL7iiZnxXfyebtZp4ESB2mHV1ooXwnNKIYbYXJ4 nsKWV0F+3X2Yjy9ZNPLB3G7eDTAwkLMDLwMc9scNDjmT2X0s4wnwGKKwEUxAXajVIu i5JGmvjiMwQBvOmSWSEti/2RCAO9VL0yxmsDJdMyHKq/eHWyxzRGNYz8n+mLD8J17q AuZd4wgt6sUj9rUZeCUyTBQ3TEn/91Bc1KdHaKujiX5/+l6lg/z/NGUsads7ZcT2y+ XEcwSXYvxaykw== 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, mw@semihalf.com, petrm@nvidia.com, wsa+renesas@sang-engineering.com, bigunclemax@gmail.com, chi.minghao@zte.com.cn, linux-omap@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/29] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Date: Sun, 9 Oct 2022 18:22:50 -0400 Message-Id: <20221009222304.1218873-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009222304.1218873-1-sashal@kernel.org> References: <20221009222304.1218873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 fac59032bf83..47a7c40f576e 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -941,7 +941,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