Skip to contentSkip to conversation

net: ethernet: litex: Fix return type of liteeth_start_xmit

PATCH Applied Nathan Huckleberry 4 participants 4 messages Sep 12, 2022 – Sep 20, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ethernet: litex: Fix return type of liteeth_start_xmit

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.

---
 drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/litex/litex_liteeth.c +2 -1
index fdd99f0de424..35f24e0f0934 100644
@@ -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;
Signature · 1 line
2.37.2.789.g6183377224-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Nathan Huckleberry

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.

Quoted 7 lines

The return type of liteeth_start_xmit should be changed from int to netdev_tx_t.

Quoted 21 lines
---
 drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/litex/litex_liteeth.c +2 -1
index fdd99f0de424..35f24e0f0934 100644
@@ -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;
Signature · 1 line
2.37.2.789.g6183377224-goog
#2 lore raw
Quoted 10 lines · Nathan Chancellor
Quoted 9 lines · Nathan Huckleberry

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.

Quoted 6 lines
Quoted 4 lines

Thanks,
--G

Quoted 21 lines
Quoted 21 lines
---
 drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/litex/litex_liteeth.c +2 -1
index fdd99f0de424..35f24e0f0934 100644
@@ -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;
Signature · 1 line
2.37.2.789.g6183377224-goog
#3 lore raw
In reply to Nathan Huckleberry
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Mon, 12 Sep 2022 12:53:07 -0700 you wrote:

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.

[...]

Here is the summary with links:
- net: ethernet: litex: Fix return type of liteeth_start_xmit

    https://git.kernel.org/netdev/net-next/c/40662333dd7c

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html