can: netlink: can_changelink(): add missing error handling to call can_ctrlmode_changelink()

[PATCH can] can: netlink: can_changelink(): add missing error handling to call can_ctrlmode_changelink()

Posted by Marc Kleine-Budde 4 weeks, 1 day ago

In commit e1a5cd9d6665 ("can: netlink: add can_ctrlmode_changelink()") the
CAN Control Mode (IFLA_CAN_CTRLMODE) handling was factored out into the
can_ctrlmode_changelink() function. But the call to
can_ctrlmode_changelink() is missing the error handling.

Add the missing error handling and propagation to the call
can_ctrlmode_changelink().

Cc: stable@vger.kernel.org
Fixes: e1a5cd9d6665 ("can: netlink: add can_ctrlmode_changelink()")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/dev/netlink.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index 0498198a4696..766d455950f5 100644
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -601,7 +601,9 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
 	/* We need synchronization with dev->stop() */
 	ASSERT_RTNL();
 
-	can_ctrlmode_changelink(dev, data, extack);
+	err = can_ctrlmode_changelink(dev, data, extack);
+	if (err)
+		return err;
 
 	if (data[IFLA_CAN_BITTIMING]) {
 		struct can_bittiming bt;

---
base-commit: e3f5e0f22cfc2371e7471c9fd5b4da78f9df7c69
change-id: 20260310-can_ctrlmode_changelink-add-error-handling-1517d06324ec

Best regards,
--  
Marc Kleine-Budde <mkl@pengutronix.de>

Re: [PATCH can] can: netlink: can_changelink(): add missing error handling to call can_ctrlmode_changelink()

Posted by Marc Kleine-Budde 3 weeks, 6 days ago

On 10.03.2026 13:48:03, Marc Kleine-Budde wrote:
> In commit e1a5cd9d6665 ("can: netlink: add can_ctrlmode_changelink()") the
> CAN Control Mode (IFLA_CAN_CTRLMODE) handling was factored out into the
> can_ctrlmode_changelink() function. But the call to
> can_ctrlmode_changelink() is missing the error handling.
>
> Add the missing error handling and propagation to the call
> can_ctrlmode_changelink().
>
> Cc: stable@vger.kernel.org
> Fixes: e1a5cd9d6665 ("can: netlink: add can_ctrlmode_changelink()")
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied to linux-can

Thanks,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |