]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: netlink: can_changelink(): add missing error handling to call can_ctrlmode_chang...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 10 Mar 2026 12:48:03 +0000 (13:48 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 19 Mar 2026 13:25:04 +0000 (14:25 +0100)
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()")
Link: https://patch.msgid.link/20260310-can_ctrlmode_changelink-add-error-handling-v1-1-0daf63d85922@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev/netlink.c

index 0498198a469658e20f31ed29ec90107841a09068..766d455950f55dee3727840c18f7dd37255cd7e9 100644 (file)
@@ -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;