Skip to contentSkip to conversation

net: ax88796c: Fix return type of ax88796c_start_xmit

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

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

PATCH 1/1 net: ax88796c: Fix return type of ax88796c_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 ax88796c_start_xmit should be changed from int to netdev_tx_t.

---
 drivers/net/ethernet/asix/ax88796c_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/asix/ax88796c_main.c +1 -1
index 6ba5b024a7be..f1d610efd69e 100644
@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
 	return 1;
 }
 
-static int
+static netdev_tx_t
 ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
 	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
Signature · 1 line
2.37.2.789.g6183377224-goog
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · when 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 ax88796c_start_xmit should be changed from int to netdev_tx_t.

Quoted 8 lines
---
 drivers/net/ethernet/asix/ax88796c_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
drivers/net/ethernet/asix/ax88796c_main.c +1 -1
index 6ba5b024a7be..f1d610efd69e 100644
@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
 	return 1;
 }
 
-static int
+static netdev_tx_t
 ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
 	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
Signature · 3 lines
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
#2 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:40:30 -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 ax88796c_start_xmit should be changed from int to netdev_tx_t.

[...]

Here is the summary with links:
- net: ax88796c: Fix return type of ax88796c_start_xmit

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

You are awesome, thank you!

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