]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
hamradio: baycom_epp: Fix return type of baycom_send_packet()
authorNathan Chancellor <nathan@kernel.org>
Wed, 2 Nov 2022 16:06:10 +0000 (09:06 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 4 Nov 2022 03:57:13 +0000 (20:57 -0700)
commitc5733e5b15d91ab679646ec3149e192996a27d5d
tree0da3ae36be6f0b755ae79d3622b964af379024c3
parent63fe6ff674a96cfcfc0fa8df1051a27aa31c70b4
hamradio: baycom_epp: Fix return type of baycom_send_packet()

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: https://github.com/ClangBuiltLinux/linux/issues/1750
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221102160610.1186145-1-nathan@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/hamradio/baycom_epp.c