| From bce271f255dae8335dc4d2ee2c4531e09cc67f5a Mon Sep 17 00:00:00 2001 |
| From: Oliver Hartkopp <socketcan@hartkopp.net> |
| Date: Tue, 21 Jun 2016 12:14:07 +0200 |
| Subject: can: fix handling of unmodifiable configuration options fix |
| |
| From: Oliver Hartkopp <socketcan@hartkopp.net> |
| |
| commit bce271f255dae8335dc4d2ee2c4531e09cc67f5a upstream. |
| |
| 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> |
| Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/can/dev.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/net/can/dev.c |
| +++ b/drivers/net/can/dev.c |
| @@ -798,6 +798,9 @@ static int can_validate(struct nlattr *t |
| * - 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]); |
| |
