]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ax88796c: Fix return type of ax88796c_start_xmit
authorNathan Huckleberry <nhuck@google.com>
Mon, 12 Sep 2022 19:40:30 +0000 (12:40 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 20 Sep 2022 01:23:04 +0000 (18:23 -0700)
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 ax88796c_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: Lukasz Stelmach <l.stelmach@samsung.com>
Link: https://lore.kernel.org/r/20220912194031.808425-1-nhuck@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/asix/ax88796c_main.c

index 6ba5b024a7be7af0791e9a7687b18d6d85b83781..f1d610efd69ee2c59861d2173346736cb2abccf0 100644 (file)
@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
        return 1;
 }
 
-static int
+static netdev_tx_t
 ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
        struct ax88796c_device *ax_local = to_ax88796c_device(ndev);