summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Huckleberry <nhuck@google.com>2022-09-12 14:45:10 -0700
committerJakub Kicinski <kuba@kernel.org>2022-09-19 18:28:50 -0700
commit73c99e26036529e633a0f2d628ad7ddff6594668 (patch)
tree508e859ee18ceb35ed9996658ddebe684dfd667b
parent0c9441c430104dcf2cd066aae74dbeefb9f9e1bf (diff)
downloadlinux-stable-73c99e26036529e633a0f2d628ad7ddff6594668.tar.gz
linux-stable-73c99e26036529e633a0f2d628ad7ddff6594668.tar.bz2
linux-stable-73c99e26036529e633a0f2d628ad7ddff6594668.zip
net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit
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 t7xx_ccmni_start_xmit 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/20220912214510.929070-1-nhuck@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/wwan/t7xx/t7xx_netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wwan/t7xx/t7xx_netdev.c b/drivers/net/wwan/t7xx/t7xx_netdev.c
index c6b6547f2c6f..f71d3bc3b237 100644
--- a/drivers/net/wwan/t7xx/t7xx_netdev.c
+++ b/drivers/net/wwan/t7xx/t7xx_netdev.c
@@ -74,7 +74,7 @@ static int t7xx_ccmni_send_packet(struct t7xx_ccmni *ccmni, struct sk_buff *skb,
return 0;
}
-static int t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct t7xx_ccmni *ccmni = wwan_netdev_drvpriv(dev);
int skb_len = skb->len;