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 F207AC433F5 for ; Sun, 9 Oct 2022 22:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233057AbiJIWqo (ORCPT ); Sun, 9 Oct 2022 18:46:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232480AbiJIWov (ORCPT ); Sun, 9 Oct 2022 18:44:51 -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 CF0B843E6F; Sun, 9 Oct 2022 15:23:16 -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 54BD8B80DE0; Sun, 9 Oct 2022 22:22:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 426E0C433D6; Sun, 9 Oct 2022 22:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354139; bh=3lKufwv5aXJvVqyKXS0hAog2IxHRM1TGVbOfE4Z6JQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DdgYThMypD8WGsnjKCbysw3OYX56/yLu4LnyB3VAzJxtN3IBsqJoIQ2CoUnFaoaPN WH2yRP4e9yYaP3cc+tgrLM+ZoaqtDKYi45CINM7bpKJmzljTEHRgVgQQhZReJYbdm3 bIEZ1GNLN4se/kSoPvQAfSPMeKqGOmm5hMDLNFIu8dspQWpKm3zjSr75vC5PY/RUMj n4IOUUegbgiLEhOkTNX6zQWdO/21MsLubRYtHh1Oj6kJfXs/oVsQvRy/xcmoByk0vB lcAfSKC7J2H6vuyVqkf+/+ih74Q4qePfQLkf/zoUn4XDjIdhX9/uLYfu5bHH96D6a9 tfDIfzL9YU6QA== 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, geoff@infradead.org, petrm@nvidia.com, shayagr@amazon.com, wsa+renesas@sang-engineering.com, dmitry.torokhov@gmail.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 16/34] net: davicom: Fix return type of dm9000_start_xmit Date: Sun, 9 Oct 2022 18:21:10 -0400 Message-Id: <20221009222129.1218277-16-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009222129.1218277-1-sashal@kernel.org> References: <20221009222129.1218277-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 afc4a103c508..c9ee5185e73e 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -1015,7 +1015,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