Commit bce271f2 authored Jun 21, 2016 by Oliver Hartkopp Committed by Marc Kleine-Budde Jun 23, 2016

can: fix handling of unmodifiable configuration options fix



With upstream commit bb208f14 (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>

parent acd43fe8

drivers/net/can/dev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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]);

Admin message