Skip to contentSkip to conversation

net: mana: Fix return type of mana_start_xmit()

PATCH Applied Nathan Chancellor 2 participants 2 messages Nov 9, 2022 – Nov 10, 2022

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

PATCH v3 1/1 net: mana: Fix return type of mana_start_xmit()

From: Nathan Huckleberry <[email protected]>

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. A new warning in clang will catch this at compile time:

drivers/net/ethernet/microsoft/mana/mana_en.c:382:21: error: incompatible function pointer types initializing 'netdev_tx_t (*)(struct sk_buff *, struct net_device *)' (aka 'enum netdev_tx (*)(struct sk_buff *, struct net_device *)') with an expression of type 'int (struct sk_buff *, struct net_device *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.ndo_start_xmit = mana_start_xmit,
^~~~~~~~~~~~~~~
1 error generated.

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

[nathan: Rebase on net-next and resolve conflicts
Add note about new clang warning]

---

v3:
- Take over for Nathan, as he is busy with other matters.
- Rebase on net-next and resolve conflicts.
- Add a note about new clang warning that will catch this issue at compile time.

v2: https://lore.kernel.org/[email protected]/

 drivers/net/ethernet/microsoft/mana/mana.h    | 2 +-
 drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/microsoft/mana/mana.h +1 -1
index d58be64374c8..ffcd27cde17b 100644
@@ -388,7 +388,7 @@ struct mana_port_context {
 	struct mana_ethtool_stats eth_stats;
 };
 
-int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev);
+netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev);
 int mana_config_rss(struct mana_port_context *ac, enum TRI_STATE rx,
 		    bool update_hash, bool update_tab);
 
drivers/net/ethernet/microsoft/mana/mana_en.c +1 -1
index 318dbbb48279..91a8d3577c14 100644
@@ -128,7 +128,7 @@ static int mana_map_skb(struct sk_buff *skb, struct mana_port_context *apc,
 	return -ENOMEM;
 }
 
-int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
 	enum mana_tx_pkt_format pkt_fmt = MANA_SHORT_PKT_FMT;
 	struct mana_port_context *apc = netdev_priv(ndev);

base-commit: 8e18be7610aebea50e9327c11afcd5eeaaa06644

Signature · 1 line
2.38.1
#1 lore raw
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:

Hello:

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

Quoted 10 lines · On Tue, 8 Nov 2022 17:26:30 -0700 you wrote:

From: Nathan Huckleberry <[email protected]>

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. A new warning in clang will catch this at compile time:

[...]

Here is the summary with links:
- [v3] net: mana: Fix return type of mana_start_xmit()

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

You are awesome, thank you!

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