提交 c5733e5b 编写于 作者: N Nathan Chancellor 提交者: Jakub Kicinski

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/1750Signed-off-by: NNathan Chancellor <nathan@kernel.org>
Reviewed-by: NKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221102160610.1186145-1-nathan@kernel.orgSigned-off-by: NJakub Kicinski <kuba@kernel.org>
上级 63fe6ff6
...@@ -758,7 +758,7 @@ static void epp_bh(struct work_struct *work) ...@@ -758,7 +758,7 @@ static void epp_bh(struct work_struct *work)
* ===================== network driver interface ========================= * ===================== network driver interface =========================
*/ */
static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t baycom_send_packet(struct sk_buff *skb, struct net_device *dev)
{ {
struct baycom_state *bc = netdev_priv(dev); struct baycom_state *bc = netdev_priv(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册