Re: [PATCH] net: korina: Fix return type of korina_send_packet

Nathan Chancellor
2022-09-13T22:32:19Z

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
>