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 EE02A5C97 for ; Sun, 9 Oct 2022 22:20:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ACDBC433D6; Sun, 9 Oct 2022 22:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354036; bh=fYsuSp3JUkpluNfcCg6BBVHqZn0UGNalYlGoMlb9ArM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/4ufroqDCz+1foaZmB63dr7d04sSU0h4q+ikym9y4GjniIbSAWpdx3UHV/YxyW2B 5YM8Ppis/iyUntF7Kti7/kgDcey/5fLgr31dZux8qkk4ZlHOWFsujpJr7DRcKhKzIq NNF8OTwGUhRlFiUxFVPeuRzANNuQAxnn31i28wn/oYlE/1NDCIBafgmRRStLbLZkpT RVV5DHBIVmLRmo5qbuZQ2u+YEk3+3FWivhKK+ZeMuOYRRelhT7yhmoKsUCfau5AX3w v/ruzoXFYfXD96qSiNKv41m8jArF7a9KBS8jsNWITml5j/ZTtQSnZmG7jb40h90Cml 7FJo4ll/DK6YQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, Nathan Chancellor , Gabriel Somlo , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kgugala@antmicro.com, mholenko@antmicro.com, joel@jms.id.au, ndesaulniers@google.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 27/46] net: ethernet: litex: Fix return type of liteeth_start_xmit Date: Sun, 9 Oct 2022 18:18:52 -0400 Message-Id: <20221009221912.1217372-27-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 40662333dd7c64664247a6138bc33f3974e3a331 ] 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 liteeth_start_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 Acked-by: Gabriel Somlo Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/litex/litex_liteeth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c index 5bb1cc8a2ce1..0aa855f838f2 100644 --- a/drivers/net/ethernet/litex/litex_liteeth.c +++ b/drivers/net/ethernet/litex/litex_liteeth.c @@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev) return 0; } -static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb, + struct net_device *netdev) { struct liteeth *priv = netdev_priv(netdev); void __iomem *txbuffer; -- 2.35.1