Commit 375629c9 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: dev: alloc_candev_mqs(): add missing default CAN capabilities



The idea behind series 6c1f5146 ("Merge patch series "can: raw: better
approach to instantly reject unsupported CAN frames"") is to set the
capabilities of a CAN device (CAN-CC, CAN-FD, CAN-XL, and listen only) [1]
and, based on these capabilities, reject unsupported CAN frames in the
CAN-RAW protocol [2].

This works perfectly for CAN devices configured in CAN-FD or CAN-XL mode.
CAN devices with static CAN control modes define their capabilities via
can_set_static_ctrlmode() -> can_set_cap_info(). CAN devices configured by
the user space for CAN-FD or CAN-XL set their capabilities via
can_changelink() -> can_ctrlmode_changelink() -> can_set_cap_info().

However, in commit 166e8732 ("can: propagate CAN device capabilities
via ml_priv"), the capabilities of CAN devices are not initialized.
This results in CAN-RAW rejecting all CAN frames on devices directly
after ifup if the user space has not changed the CAN control mode.

Fix this problem by setting the default capabilities to CAN-CC in
alloc_candev_mqs() as soon as the CAN specific ml_priv is allocated.

[1] commit 166e8732 ("can: propagate CAN device capabilities via ml_priv")
[2] commit faba5860 ("can: raw: instantly reject disabled CAN frames")

Fixes: 166e8732 ("can: propagate CAN device capabilities via ml_priv")
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://patch.msgid.link/20260116-can_add_missing_set_caps-v1-1-7525126d8b20@pengutronix.de


[mkl: fix typo in subject]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent a74c7a58
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,

	can_ml = (void *)priv + ALIGN(sizeof_priv, NETDEV_ALIGN);
	can_set_ml_priv(dev, can_ml);
	can_set_cap(dev, CAN_CAP_CC);

	if (echo_skb_max) {
		priv->echo_skb_max = echo_skb_max;