Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe119a05 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by David S. Miller
Browse files

can: dev: fix nlmsg size calculation in can_get_size() 



This patch fixes the calculation of the nlmsg size, by adding the missing
nla_total_size().

Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a7e2260

drivers/net/can/dev.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -705,14 +705,14 @@ static size_t can_get_size(const struct net_device *dev) 
	size_t size;

	size_t size;





	size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */

	size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */

	size += sizeof(struct can_ctrlmode);  /* IFLA_CAN_CTRLMODE */

	size += nla_total_size(sizeof(struct can_ctrlmode));  /* IFLA_CAN_CTRLMODE */

	size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */

	size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */

	size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */

	size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */

	size += sizeof(struct can_clock);     /* IFLA_CAN_CLOCK */

	size += nla_total_size(sizeof(struct can_clock));     /* IFLA_CAN_CLOCK */

	if (priv->do_get_berr_counter)        /* IFLA_CAN_BERR_COUNTER */

	if (priv->do_get_berr_counter)        /* IFLA_CAN_BERR_COUNTER */

		size += sizeof(struct can_berr_counter);

		size += nla_total_size(sizeof(struct can_berr_counter));

	if (priv->bittiming_const)	      /* IFLA_CAN_BITTIMING_CONST */

	if (priv->bittiming_const)	      /* IFLA_CAN_BITTIMING_CONST */

		size += sizeof(struct can_bittiming_const);

		size += nla_total_size(sizeof(struct can_bittiming_const));





	return size;

	return size;

}

}