[PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit
From: Nathan Huckleberry
Date: Mon Sep 12 2022 - 15:53:29 EST
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 liteeth_start_xmit should be changed from int to
netdev_tx_t.
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@xxxxxxxxxxxxxxx
Signed-off-by: Nathan Huckleberry <nhuck@xxxxxxxxxx>
---
drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
index fdd99f0de424..35f24e0f0934 100644
--- a/drivers/net/ethernet/litex/litex_liteeth.c
+++ b/drivers/net/ethernet/litex/litex_liteeth.c
@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
return 0;
}
-static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
+ struct net_device *netdev)
{
struct liteeth *priv = netdev_priv(netdev);
void __iomem *txbuffer;
--
2.37.2.789.g6183377224-goog