From: Nathan Huckleberry Date: Mon, 12 Sep 2022 21:43:40 +0000 (-0700) Subject: net: korina: Fix return type of korina_send_packet X-Git-Tag: nvme-6.1-2022-10-12~77^2~187 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=106c67ce46f3c82dd276e983668a91d6ed631173;p=nvme.git net: korina: Fix return type of korina_send_packet 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 Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Signed-off-by: Nathan Huckleberry Reviewed-by: Nathan Chancellor Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index 90e458de9aa2..27194398d8ba 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;