[net-next] can: raw: fix build without CONFIG_CAN_DEV
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: 2025-11-27 21:08:03
Also in:
linux-can
Subsystem:
can network layer, the rest · Maintainers:
Oliver Hartkopp, Marc Kleine-Budde, Linus Torvalds
The feature to instantly reject unsupported CAN frames makes use of CAN
netdevice specific flags which are only accessible when the CAN device
driver infrastructure is built.
Therefore check for CONFIG_CAN_DEV and fall back to MTU testing when the
CAN device driver infrastructure is absent.
Fixes: 1a620a723853 ("can: raw: instantly reject unsupported CAN frames")
Reported-by: Vincent Mailhol <mailhol@kernel.org>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
net/can/raw.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/net/can/raw.c b/net/can/raw.c
index 223630f0f9e9..9d5c43df06dd 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c@@ -890,62 +890,66 @@ static void raw_put_canxl_vcid(struct raw_sock *ro, struct sk_buff *skb) cxl->prio &= CANXL_PRIO_MASK; cxl->prio |= ro->tx_vcid_shifted; } } -static inline bool raw_dev_cc_enabled(struct net_device *dev, - struct can_priv *priv) +static bool raw_dev_cc_enabled(struct net_device *dev) { +#ifdef CONFIG_CAN_DEV + struct can_priv *priv = safe_candev_priv(dev); + /* The CANXL-only mode disables error-signalling on the CAN bus * which is needed to send CAN CC/FD frames */ if (priv) return !can_dev_in_xl_only_mode(priv); - +#endif /* virtual CAN interfaces always support CAN CC */ return true; } -static inline bool raw_dev_fd_enabled(struct net_device *dev, - struct can_priv *priv) +static bool raw_dev_fd_enabled(struct net_device *dev) { +#ifdef CONFIG_CAN_DEV + struct can_priv *priv = safe_candev_priv(dev); + /* check FD ctrlmode on real CAN interfaces */ if (priv) return (priv->ctrlmode & CAN_CTRLMODE_FD); - +#endif /* check MTU for virtual CAN FD interfaces */ return (READ_ONCE(dev->mtu) >= CANFD_MTU); } -static inline bool raw_dev_xl_enabled(struct net_device *dev, - struct can_priv *priv) +static bool raw_dev_xl_enabled(struct net_device *dev) { +#ifdef CONFIG_CAN_DEV + struct can_priv *priv = safe_candev_priv(dev); + /* check XL ctrlmode on real CAN interfaces */ if (priv) return (priv->ctrlmode & CAN_CTRLMODE_XL); - +#endif /* check MTU for virtual CAN XL interfaces */ return can_is_canxl_dev_mtu(READ_ONCE(dev->mtu)); } static unsigned int raw_check_txframe(struct raw_sock *ro, struct sk_buff *skb, struct net_device *dev) { - struct can_priv *priv = safe_candev_priv(dev); - /* Classical CAN */ - if (can_is_can_skb(skb) && raw_dev_cc_enabled(dev, priv)) + if (can_is_can_skb(skb) && raw_dev_cc_enabled(dev)) return CAN_MTU; /* CAN FD */ if (ro->fd_frames && can_is_canfd_skb(skb) && - raw_dev_fd_enabled(dev, priv)) + raw_dev_fd_enabled(dev)) return CANFD_MTU; /* CAN XL */ if (ro->xl_frames && can_is_canxl_skb(skb) && - raw_dev_xl_enabled(dev, priv)) + raw_dev_xl_enabled(dev)) return CANXL_MTU; return 0; }
--
2.47.3