Skip to content

Commit

Permalink
net: wwan: iosm: Fix return type of ipc_wwan_link_transmit
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 ipc_wwan_link_transmit 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>
Acked-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Link: https://lore.kernel.org/r/20220912214455.929028-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 106c67c commit 0c9441c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wwan/iosm/iosm_ipc_wwan.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev)
}

/* Transmit a packet */
static int ipc_wwan_link_transmit(struct sk_buff *skb,
struct net_device *netdev)
static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb,
struct net_device *netdev)
{
struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev);
struct iosm_wwan *ipc_wwan = priv->ipc_wwan;
Expand Down

0 comments on commit 0c9441c

Please sign in to comment.