From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Nathan Huckleberry <nhuck@google.com>,
Dan Carpenter <error27@gmail.com>,
llvm@lists.linux.dev, Nathan Chancellor <nathan@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>,
davem@davemloft.net, edumazet@google.com, pabeni@redhat.com,
ndesaulniers@google.com, mkl@pengutronix.de,
thomas.lendacky@amd.com, khalasa@piap.pl,
wsa+renesas@sang-engineering.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 11/16] net: korina: Fix return type of korina_send_packet
Date: Sun, 9 Oct 2022 18:27:07 -0400 [thread overview]
Message-ID: <20221009222713.1220394-11-sashal@kernel.org> (raw)
In-Reply-To: <20221009222713.1220394-1-sashal@kernel.org>
From: Nathan Huckleberry <nhuck@google.com>
[ 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 <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 4cf1fc89df3c..b9c02cd3a78e 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -193,7 +193,8 @@ static void korina_chain_rx(struct korina_private *lp,
}
/* 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);
unsigned long flags;
--
2.35.1
next prev parent reply other threads:[~2022-10-09 22:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 22:26 [PATCH AUTOSEL 4.9 01/16] openvswitch: Fix double reporting of drops in dropwatch Sasha Levin
2022-10-09 22:26 ` [PATCH AUTOSEL 4.9 02/16] openvswitch: Fix overreporting " Sasha Levin
2022-10-09 22:26 ` [PATCH AUTOSEL 4.9 03/16] tcp: annotate data-race around tcp_md5sig_pool_populated Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 04/16] xfrm: Update ipcomp_scratches with NULL when freed Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 05/16] net: xscale: Fix return type for implementation of ndo_start_xmit Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 06/16] net: lantiq_etop: " Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 07/16] net: ftmac100: fix endianness-related issues from 'sparse' Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 08/16] Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 09/16] net: davicom: Fix return type of dm9000_start_xmit Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 10/16] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Sasha Levin
2022-10-09 22:27 ` Sasha Levin [this message]
2022-10-17 10:25 ` [PATCH AUTOSEL 4.9 11/16] net: korina: Fix return type of korina_send_packet Pavel Machek
2022-10-17 12:50 ` Pavel Machek
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 12/16] Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 13/16] can: bcm: check the result of can_send() in bcm_can_tx() Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 14/16] wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 15/16] Bluetooth: L2CAP: Fix user-after-free Sasha Levin
2022-10-09 22:27 ` [PATCH AUTOSEL 4.9 16/16] r8152: Rate limit overflow messages Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009222713.1220394-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=error27@gmail.com \
--cc=khalasa@piap.pl \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mkl@pengutronix.de \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=nhuck@google.com \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®