* [PATCH] net: korina: Fix return type of korina_send_packet
@ 2022-09-12 21:43 Nathan Huckleberry
2022-09-13 22:32 ` Nathan Chancellor
2022-09-20 1:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Nathan Huckleberry @ 2022-09-12 21:43 UTC (permalink / raw)
Cc: Nathan Huckleberry, Dan Carpenter, llvm, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, 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 korina_send_packet 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/korina.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index df9a8eefa007..eec6a9ec528b 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev)
}
/* transmit packet */
-static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t korina_send_packet(struct sk_buff *skb,
+ struct net_device *dev)
{
struct korina_private *lp = netdev_priv(dev);
u32 chain_prev, chain_next;
--
2.37.2.789.g6183377224-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: korina: Fix return type of korina_send_packet
2022-09-12 21:43 [PATCH] net: korina: Fix return type of korina_send_packet Nathan Huckleberry
@ 2022-09-13 22:32 ` 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:32 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Carpenter, llvm, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Nick Desaulniers, Tom Rix, netdev,
linux-kernel
On Mon, Sep 12, 2022 at 02:43:40PM -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 korina_send_packet 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/korina.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
> index df9a8eefa007..eec6a9ec528b 100644
> --- a/drivers/net/ethernet/korina.c
> +++ b/drivers/net/ethernet/korina.c
> @@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev)
> }
>
> /* transmit packet */
> -static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
> +static netdev_tx_t korina_send_packet(struct sk_buff *skb,
> + struct net_device *dev)
> {
> struct korina_private *lp = netdev_priv(dev);
> u32 chain_prev, chain_next;
> --
> 2.37.2.789.g6183377224-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: korina: Fix return type of korina_send_packet
2022-09-12 21:43 [PATCH] net: korina: Fix return type of korina_send_packet Nathan Huckleberry
2022-09-13 22:32 ` 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, davem, edumazet, kuba, pabeni, 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 14:43:40 -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 korina_send_packet should be changed from int to
> netdev_tx_t.
>
> [...]
Here is the summary with links:
- net: korina: Fix return type of korina_send_packet
https://git.kernel.org/netdev/net-next/c/106c67ce46f3
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 21:43 [PATCH] net: korina: Fix return type of korina_send_packet Nathan Huckleberry
2022-09-13 22:32 ` 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;
as well as URLs for NNTP newsgroup(s).