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 8E083C433F5 for ; Sun, 9 Oct 2022 22:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231898AbiJIWZZ (ORCPT ); Sun, 9 Oct 2022 18:25:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231828AbiJIWXq (ORCPT ); Sun, 9 Oct 2022 18:23:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B0AA3BC70; Sun, 9 Oct 2022 15:18:03 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 3999E60C91; Sun, 9 Oct 2022 22:17:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F20DAC433C1; Sun, 9 Oct 2022 22:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353871; bh=ogt3V7+LBk8Gdt6iLASjve7CAKDWMDuO9ZpCqoRCGro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OLvwEizf6EyvxkyX4pTm6p7EOULUwi4UP20MufbiJo5ZZ4beo8WJTlZPik3qzra27 QP//xckQij/Z1UcwTF1Dnb0XQZ1M6qdHPLHn/re9gI2PXjmAd28kdPC3xtqf8yk+vU taaWRgI4nZYiPdALvlC1fSuIj1UbN0/55ebCfN9+A+VBWmKiQeh8yCyRXdN4jmGhXe EubtzePuxUzbzjIzjN7RI8cAtd/orN0yAtQFsirJlP1/sxydtauapD1atJ75hm7HNe adTHOjdmiOT3RxoaC6lH+oaY7aPH74uy13vIpTH7JmGjuLwCbbE2pvqvbJkuZ+MGTp L9rtetQALEH9w== 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, shayagr@amazon.com, geoff@infradead.org, thomas.lendacky@amd.com, wsa+renesas@sang-engineering.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 46/73] net: korina: Fix return type of korina_send_packet Date: Sun, 9 Oct 2022 18:14:24 -0400 Message-Id: <20221009221453.1216158-46-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221453.1216158-1-sashal@kernel.org> References: <20221009221453.1216158-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: linux-kernel@vger.kernel.org From: Nathan Huckleberry [ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] 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 korina_send_packet 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/20220912214344.928925-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/korina.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index df9a8eefa007..eec6a9ec528b 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c @@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev) } /* transmit packet */ -static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t korina_send_packet(struct sk_buff *skb, + struct net_device *dev) { struct korina_private *lp = netdev_priv(dev); u32 chain_prev, chain_next; -- 2.35.1