diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2016-06-21 12:14:07 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2016-06-23 10:58:16 +0200 |
| commit | bce271f255dae8335dc4d2ee2c4531e09cc67f5a (patch) | |
| tree | cef6df6dafbd828be610e723b056c740dbf07079 /drivers/net | |
| parent | Merge branch 'mlx4-fixes' (diff) | |
| download | linux-bce271f255dae8335dc4d2ee2c4531e09cc67f5a.tar.xz linux-bce271f255dae8335dc4d2ee2c4531e09cc67f5a.zip | |
can: fix handling of unmodifiable configuration options fix
With upstream commit bb208f144cf3f59 (can: fix handling of unmodifiable
configuration options) a new can_validate() function was introduced.
When invoking 'ip link set can0 type can' without any configuration data
can_validate() tries to validate the content without taking into account that
there's totally no content. This patch adds a check for missing content.
Reported-by: ajneu <ajneu1@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 910c12e2638e..348dd5001fa4 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -798,6 +798,9 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[]) * - control mode with CAN_CTRLMODE_FD set */ + if (!data) + return 0; + if (data[IFLA_CAN_CTRLMODE]) { struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]); |