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 CC08AC4332F for ; Sun, 9 Oct 2022 22:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbiJIWYG (ORCPT ); Sun, 9 Oct 2022 18:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231559AbiJIWXM (ORCPT ); Sun, 9 Oct 2022 18:23:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF00E37188; Sun, 9 Oct 2022 15:17:49 -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 60B40B80DD1; Sun, 9 Oct 2022 22:11:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EC32C433D7; Sun, 9 Oct 2022 22:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353487; bh=4F5xLHe7kfVJXUiQ/RthEjjNUE1FM04erdeaO+pyyjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tci8Y7BBVLf82VTGMUYCraBNhyOJgJiWqizRYlZXpGOtZ7K9q0T/OLGs/ZXCWA+Vb YQHRQtHxr/3Nmzg4eUVDPWmEkJyYF0rW8vgU8fQpqNmaBXVQ81Ga9LBjPk06QVkVd0 FPTM2JBVdRGYu4U9NYcba4qT8mRhT2cI2NOMKtwDZEnZ0I+KBQGhaZdpa7gKYX34D0 S9fT7+UXlktbKrreGSlP+g3vVV+eX7tJDTdRxj4/crULxGxf+WQRY24py4Gv2bbWKd LcEASbxxnZbuf9tSbHVqTVnQPdL524VWEUcIcXb8YOSt8/mH4SJD2WXxJ67puzjuK5 jV5u3rdbx+ydA== 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, petrm@nvidia.com, thomas.lendacky@amd.com, geoff@infradead.org, mw@semihalf.com, wsa+renesas@sang-engineering.com, dmitry.torokhov@gmail.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 46/77] net: davicom: Fix return type of dm9000_start_xmit Date: Sun, 9 Oct 2022 18:07:23 -0400 Message-Id: <20221009220754.1214186-46-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009220754.1214186-1-sashal@kernel.org> References: <20221009220754.1214186-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 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] 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 dm9000_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 Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/davicom/dm9000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 0985ab216566..186a5e0a7862 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -1012,7 +1012,7 @@ static void dm9000_send_packet(struct net_device *dev, * Hardware start transmission. * Send a packet to media from the upper layer. */ -static int +static netdev_tx_t dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned long flags; -- 2.35.1