net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit
Subsystems (3)
PATCH 1/1 net: ethernet: ti: davinci_emac: Fix return type of emac_dev_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 emac_dev_xmit should be changed from int to netdev_tx_t.
--- drivers/net/ethernet/ti/davinci_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/davinci_emac.c +1 -1
@@ -949,7 +949,7 @@ static void emac_tx_handler(void *token, int len, int status)* * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) */ -static int emac_dev_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t emac_dev_xmit (struct sk_buff *skb,struct net_device *ndev) {struct device *emac_dev = &ndev->dev;int ret_code;
Signature · 1 line
2.37.2.789.g6183377224-goog
Quoted 6 lines · Nathan Huckleberry
The
ndo_start_xmitfield innet_device_opsis expected to be of typenetdev_tx_t(*ndo_start_xmit)(structsk_buff*skb, structnet_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
emac_dev_xmitshould be changed from int tonetdev_tx_t.
Quoted 20 lines
--- drivers/net/ethernet/ti/davinci_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/ti/davinci_emac.c +1
-1@@ -949,7 +949,7 @@ static void emac_tx_handler(void *token, int len, int status)* * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) */ -static int emac_dev_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t emac_dev_xmit (struct sk_buff *skb,struct net_device *ndev) {struct device *emac_dev = &ndev->dev;int ret_code;Signature · 1 line
2.37.2.789.g6183377224-goog
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:50:19 -0700 you wrote:
The
ndo_start_xmitfield innet_device_opsis expected to be of typenetdev_tx_t(*ndo_start_xmit)(structsk_buff*skb, structnet_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
emac_dev_xmitshould be changed from int tonetdev_tx_t.[...]
Here is the summary with links:
- net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit
https://git.kernel.org/netdev/net-next/c/5972ca946098
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html