Skip to content

Commit 61e7bdd

Browse files
nathanchancemorimoto
authored andcommitted
net: ethernet: renesas: Fix return type of rswitch_start_xmit()
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals: drivers/net/ethernet/renesas/rswitch.c:1533:20: error: incompatible function pointer types initializing 'netdev_tx_t (*)(struct sk_buff *, struct net_device *)' (aka 'enum netdev_tx (*)(struct sk_buff *, struct net_device *)') with an expression of type 'int (struct sk_buff *, struct net_device *)' [-Werror,-Wincompatible-function-pointer-types-strict] .ndo_start_xmit = rswitch_start_xmit, ^~~~~~~~~~~~~~~~~~ 1 error generated. ->ndo_start_xmit() in 'struct net_device_ops' expects a return type of 'netdev_tx_t', not 'int'. Adjust the return type of rswitch_start_xmit() to match the prototype's to resolve the warning and CFI failure. Link: ClangBuiltLinux#1750 Signed-off-by: Nathan Chancellor <[email protected]> Reviewed-by: Yoshihiro Shimoda <[email protected]> Reviewed-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit 8e0aa1f) Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Kuninori Morimoto <[email protected]>
1 parent 325284c commit 61e7bdd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ethernet/renesas/rswitch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ static int rswitch_stop(struct net_device *ndev)
13901390
return 0;
13911391
};
13921392

1393-
static int rswitch_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1393+
static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *ndev)
13941394
{
13951395
struct rswitch_device *rdev = netdev_priv(ndev);
13961396
struct rswitch_gwca_queue *gq = rdev->tx_queue;

0 commit comments

Comments
 (0)