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 CD8D3C43217 for ; Sun, 9 Oct 2022 22:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231396AbiJIWST (ORCPT ); Sun, 9 Oct 2022 18:18:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231395AbiJIWR7 (ORCPT ); Sun, 9 Oct 2022 18:17:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25F582DAAF; Sun, 9 Oct 2022 15:15:34 -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 93F8460CBB; Sun, 9 Oct 2022 22:12:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FEA2C433D6; Sun, 9 Oct 2022 22:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353521; bh=ogt3V7+LBk8Gdt6iLASjve7CAKDWMDuO9ZpCqoRCGro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oj1qPalC9Pl5Nsn4dklEPFqTYHRbUFIgq1YZ99Hr921zq5xImRJfuzWeJcpAjcEmw M+XLQst9j8/NpXRnPOSDBeb5aNAyYvnykMD9+qdQvUYFbd0pSRz8cDcX0X4djy7+c3 k46nFxrfE27UmYIovoImo72JPl3ogugYQ1oTBesl2BRaIiAFhbYLHcRW5eLFMlZOEi 16q/XZousI4fvpTy7Fd/g6bqPTexMNufMn2nVMmYFS8/QuLrqrvST3y2YaJQgk+htf yISRCNihP+UrcDhzAdzYRy0irMA+A0mHIJ8r4Qt/B5B37YSx6d2HpfqRNglDem46rR L3xkzGL2TeNzg== 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, leon@kernel.org, mw@semihalf.com, shayagr@amazon.com, wsa+renesas@sang-engineering.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 49/77] net: korina: Fix return type of korina_send_packet Date: Sun, 9 Oct 2022 18:07:26 -0400 Message-Id: <20221009220754.1214186-49-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 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