* [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit
@ 2022-09-12 19:50 Nathan Huckleberry
2022-09-13 22:30 ` Nathan Chancellor
2022-09-20 1:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Nathan Huckleberry @ 2022-09-12 19:50 UTC (permalink / raw)
Cc: Nathan Huckleberry, Dan Carpenter, llvm, Grygorii Strashko,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Nathan Chancellor, Nick Desaulniers, Tom Rix, Lad Prabhakar,
Maxim Kiselev, Minghao Chi, linux-omap, netdev, linux-kernel
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.
Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
---
drivers/net/ethernet/ti/davinci_emac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 2a3e4e842fa5..e203a5984f03 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -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;
--
2.37.2.789.g6183377224-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit
2022-09-12 19:50 [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Nathan Huckleberry
@ 2022-09-13 22:30 ` Nathan Chancellor
2022-09-20 1:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2022-09-13 22:30 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Carpenter, llvm, Grygorii Strashko, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Nick Desaulniers,
Tom Rix, Lad Prabhakar, Maxim Kiselev, Minghao Chi, linux-omap,
netdev, linux-kernel
On Mon, Sep 12, 2022 at 12:50:19PM -0700, Nathan Huckleberry 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 emac_dev_xmit should be changed from int to
> netdev_tx_t.
>
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc: llvm@lists.linux.dev
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> drivers/net/ethernet/ti/davinci_emac.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
> index 2a3e4e842fa5..e203a5984f03 100644
> --- a/drivers/net/ethernet/ti/davinci_emac.c
> +++ b/drivers/net/ethernet/ti/davinci_emac.c
> @@ -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;
> --
> 2.37.2.789.g6183377224-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit
2022-09-12 19:50 [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Nathan Huckleberry
2022-09-13 22:30 ` Nathan Chancellor
@ 2022-09-20 1:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-20 1:40 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: error27, llvm, grygorii.strashko, davem, edumazet, kuba, pabeni,
nathan, ndesaulniers, trix, prabhakar.mahadev-lad.rj, bigunclemax,
chi.minghao, linux-omap, netdev, linux-kernel
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 12 Sep 2022 12:50:19 -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 emac_dev_xmit should be changed from int to
> netdev_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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-20 1:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 19:50 [PATCH] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Nathan Huckleberry
2022-09-13 22:30 ` Nathan Chancellor
2022-09-20 1:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox