Skip to content

Commit 1adbbdc

Browse files
nathanchancegregkh
authored andcommitted
hamradio: baycom_epp: Fix return type of baycom_send_packet()
[ Upstream commit c5733e5 ] 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/hamradio/baycom_epp.c:1119:25: 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 = baycom_send_packet, ^~~~~~~~~~~~~~~~~~ 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 baycom_send_packet() to match the prototype's to resolve the warning and CFI failure. Link: ClangBuiltLinux/linux#1750 Signed-off-by: Nathan Chancellor <[email protected]> Reviewed-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1e4953b commit 1adbbdc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/hamradio/baycom_epp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ static void epp_bh(struct work_struct *work)
758758
* ===================== network driver interface =========================
759759
*/
760760

761-
static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev)
761+
static netdev_tx_t baycom_send_packet(struct sk_buff *skb, struct net_device *dev)
762762
{
763763
struct baycom_state *bc = netdev_priv(dev);
764764

0 commit comments

Comments
 (0)