diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2026-03-10 13:48:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-04-02 13:23:18 +0200 |
| commit | f162aa749a40f5053c5d551851c351a2d30004ae (patch) | |
| tree | bf01a7b7a8b518b595446be220a9b761182742af /drivers/net/can | |
| parent | eec8a1b18a79600bd4419079dc0026c1db72a830 (diff) | |
| download | linux-f162aa749a40f5053c5d551851c351a2d30004ae.tar.gz linux-f162aa749a40f5053c5d551851c351a2d30004ae.tar.bz2 linux-f162aa749a40f5053c5d551851c351a2d30004ae.zip | |
can: netlink: can_changelink(): add missing error handling to call can_ctrlmode_changelink()
commit cadf6019231b614ebbd9ec2a16e5997ecbd8d016 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/dev/netlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c index 6f83b87d54fc..fcfff221d1cc 100644 --- a/drivers/net/can/dev/netlink.c +++ b/drivers/net/can/dev/netlink.c @@ -407,7 +407,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; |