]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ethernet: litex: Fix return type of liteeth_start_xmit
authorNathan Huckleberry <nhuck@google.com>
Mon, 12 Sep 2022 19:53:07 +0000 (12:53 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 20 Sep 2022 01:23:39 +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 liteeth_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>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/litex/litex_liteeth.c

index fdd99f0de424dce95aba61410afcca7a8aa30838..35f24e0f0934932fd8feaa53223dbbb5c081f2ee 100644 (file)
@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
        return 0;
 }
 
-static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
+                                     struct net_device *netdev)
 {
        struct liteeth *priv = netdev_priv(netdev);
        void __iomem *txbuffer;