Skip to contentSkip to conversation

net: wwan: iosm: Fix return type of ipc_wwan_link_transmit

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

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

PATCH 1/1 net: wwan: iosm: Fix return type of ipc_wwan_link_transmit

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 ipc_wwan_link_transmit should be changed from int to netdev_tx_t.

---
 drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wwan/iosm/iosm_ipc_wwan.c +2 -2
index 27151148c782..03757ad21d51 100644
@@ -103,8 +103,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev)
 }
 
 /* Transmit a packet */
-static int ipc_wwan_link_transmit(struct sk_buff *skb,
-				  struct net_device *netdev)
+static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb,
+					  struct net_device *netdev)
 {
 	struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev);
 	struct iosm_wwan *ipc_wwan = priv->ipc_wwan;
Signature · 1 line
2.37.2.789.g6183377224-goog
maintainer Acked-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 ipc_wwan_link_transmit should be changed from int to netdev_tx_t.

#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 14:44:55 -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 ipc_wwan_link_transmit should be changed from int to netdev_tx_t.

[...]

Here is the summary with links:
- net: wwan: iosm: Fix return type of ipc_wwan_link_transmit

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

You are awesome, thank you!

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