* [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit
@ 2022-09-12 19:53 Nathan Huckleberry
2022-09-13 22:31 ` Nathan Chancellor
2022-09-20 1:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Nathan Huckleberry @ 2022-09-12 19:53 UTC (permalink / raw)
Cc: Nathan Huckleberry, Dan Carpenter, llvm, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Karol Gugala,
Mateusz Holenko, Gabriel Somlo, Joel Stanley, Nathan Chancellor,
Nick Desaulniers, Tom Rix, 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 liteeth_start_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/litex/litex_liteeth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
index fdd99f0de424..35f24e0f0934 100644
--- a/drivers/net/ethernet/litex/litex_liteeth.c
+++ b/drivers/net/ethernet/litex/litex_liteeth.c
@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
return 0;
}
-static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
+ struct net_device *netdev)
{
struct liteeth *priv = netdev_priv(netdev);
void __iomem *txbuffer;
--
2.37.2.789.g6183377224-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit
2022-09-12 19:53 [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit Nathan Huckleberry
@ 2022-09-13 22:31 ` Nathan Chancellor
2022-09-14 12:06 ` Gabriel L. Somlo
2022-09-20 1:40 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 4+ messages in thread
From: Nathan Chancellor @ 2022-09-13 22:31 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Carpenter, llvm, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Karol Gugala, Mateusz Holenko,
Gabriel Somlo, Joel Stanley, Nick Desaulniers, Tom Rix, netdev,
linux-kernel
On Mon, Sep 12, 2022 at 12:53:07PM -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 liteeth_start_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/litex/litex_liteeth.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
> index fdd99f0de424..35f24e0f0934 100644
> --- a/drivers/net/ethernet/litex/litex_liteeth.c
> +++ b/drivers/net/ethernet/litex/litex_liteeth.c
> @@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
> return 0;
> }
>
> -static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
> +static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
> + struct net_device *netdev)
> {
> struct liteeth *priv = netdev_priv(netdev);
> void __iomem *txbuffer;
> --
> 2.37.2.789.g6183377224-goog
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit
2022-09-13 22:31 ` Nathan Chancellor
@ 2022-09-14 12:06 ` Gabriel L. Somlo
0 siblings, 0 replies; 4+ messages in thread
From: Gabriel L. Somlo @ 2022-09-14 12:06 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Nathan Huckleberry, Dan Carpenter, llvm, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Karol Gugala,
Mateusz Holenko, Joel Stanley, Nick Desaulniers, Tom Rix, netdev,
linux-kernel
On Tue, Sep 13, 2022 at 03:31:11PM -0700, Nathan Chancellor wrote:
> On Mon, Sep 12, 2022 at 12:53:07PM -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 liteeth_start_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>
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Thanks,
--G
> > ---
> > drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
> > index fdd99f0de424..35f24e0f0934 100644
> > --- a/drivers/net/ethernet/litex/litex_liteeth.c
> > +++ b/drivers/net/ethernet/litex/litex_liteeth.c
> > @@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
> > return 0;
> > }
> >
> > -static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
> > +static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
> > + struct net_device *netdev)
> > {
> > struct liteeth *priv = netdev_priv(netdev);
> > void __iomem *txbuffer;
> > --
> > 2.37.2.789.g6183377224-goog
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit
2022-09-12 19:53 [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit Nathan Huckleberry
2022-09-13 22:31 ` Nathan Chancellor
@ 2022-09-20 1:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-20 1:40 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: error27, llvm, davem, edumazet, kuba, pabeni, kgugala, mholenko,
gsomlo, joel, nathan, ndesaulniers, trix, 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:53:07 -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 liteeth_start_xmit should be changed from int to
> netdev_tx_t.
>
> [...]
Here is the summary with links:
- net: ethernet: litex: Fix return type of liteeth_start_xmit
https://git.kernel.org/netdev/net-next/c/40662333dd7c
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] 4+ messages in thread
end of thread, other threads:[~2022-09-20 1:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 19:53 [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit Nathan Huckleberry
2022-09-13 22:31 ` Nathan Chancellor
2022-09-14 12:06 ` Gabriel L. Somlo
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