diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2021-08-09 21:07:14 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-02-06 13:57:26 +0100 |
| commit | d58ac89d0d388da82630bb9d3823420cddbdabb2 (patch) | |
| tree | 8409778dbe570612f6856bea888ce5a91913aeae /drivers/net/can/dev | |
| parent | 8e0a0b32c4ff7a5c2654a5f8fc37a9f1b6f58816 (diff) | |
| download | linux-d58ac89d0d388da82630bb9d3823420cddbdabb2.tar.gz linux-d58ac89d0d388da82630bb9d3823420cddbdabb2.tar.bz2 linux-d58ac89d0d388da82630bb9d3823420cddbdabb2.zip | |
can: dev: register_candev(): ensure that bittiming const are valid
Implement the function can_bittiming_const_valid() to check the
validity of the specified bit timing constant. Call this function from
register_candev() to check the bit timing constants during the
registration of the CAN interface.
Link: https://lore.kernel.org/all/20230202110854.2318594-6-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/dev')
| -rw-r--r-- | drivers/net/can/dev/dev.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c index c1956b1e9faf..3b51055be40e 100644 --- a/drivers/net/can/dev/dev.c +++ b/drivers/net/can/dev/dev.c @@ -498,6 +498,18 @@ static int can_get_termination(struct net_device *ndev) return 0; } +static bool +can_bittiming_const_valid(const struct can_bittiming_const *btc) +{ + if (!btc) + return true; + + if (!btc->sjw_max) + return false; + + return true; +} + /* Register the CAN network device */ int register_candev(struct net_device *dev) { @@ -518,6 +530,10 @@ int register_candev(struct net_device *dev) if (!priv->data_bitrate_const != !priv->data_bitrate_const_cnt) return -EINVAL; + if (!can_bittiming_const_valid(priv->bittiming_const) || + !can_bittiming_const_valid(priv->data_bittiming_const)) + return -EINVAL; + if (!priv->termination_const) { err = can_get_termination(dev); if (err) |