Skip to content

Commit

Permalink
net: korina: Fix return type of korina_send_packet
Browse files Browse the repository at this point in the history
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>
Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Nathan Huckleberry authored and Jakub Kicinski committed Sep 20, 2022
1 parent 4066233 commit 106c67c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/korina.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 106c67c

Please sign in to comment.