2022-09-20 01:33:03

by Jakub Kicinski

Subject: Re: [PATCH] net: mana: Fix return type of mana_start_xmit

On Mon, 12 Sep 2022 14:43:53 -0700 Nathan Huckleberry wrote:
> -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)

This one has a prototype.

2022-09-29 18:17:01

by Nathan Huckleberry

Subject: [PATCH v2] net: mana: Fix return type of mana_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 mana_start_xmit should be changed from int to
netdev_tx_t.

Reported-by: Dan Carpenter <[email protected]>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: [email protected]
Signed-off-by: Nathan Huckleberry <[email protected]>
Reviewed-by: Dexuan Cui <[email protected]>
---

Changes v1 -> v2
- Update header file

drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +-
include/net/mana/mana.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 7ca313c7b7b3..a3df5678bb4f 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -141,7 +141,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);
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 20212ffeefb9..3bb579962a14 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -390,7 +390,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);

--
2.38.0.rc1.362.ged0d419d3c-goog

2022-10-04 00:10:24

by Jakub Kicinski

Subject: Re: [PATCH v2] net: mana: Fix return type of mana_start_xmit

On Thu, 29 Sep 2022 11:14:11 -0700 Nathan Huckleberry wrote:
> include/net/mana/mana.h | 2 +-

This file does not exist in the net-next tree :S
Perhaps it was created when RDMA support was added?
Anyway, repost in a couple of weeks, it should all be straightened out
after the merge window.