[PATCH] can: dev: fix nlmsg size calculation in can_get_size()

* [PATCH] can: dev: fix nlmsg size calculation in can_get_size()
@ 2013-10-05 19:25 Marc Kleine-Budde
  2013-10-05 20:50 ` Wolfgang Grandegger
  2013-10-07 19:56 ` David Miller
  0 siblings, 2 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2013-10-05 19:25 UTC (permalink / raw)
  To: netdev; +Cc: linux-can, kernel, Wolfgang Grandegger, Marc Kleine-Budde

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

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hello,

this patch touches the rtnl_link_ops get_size() callback:

    static struct rtnl_link_ops can_link_ops __read_mostly = {
    ...
    	.get_size	= can_get_size,
    ...
    };

By looking at other nlmsg size calculation I think a nla_total_size() for all
contributers is needed. Am I correct?

regards,
Marc

 drivers/net/can/dev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f9cba41..1870c47 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -705,14 +705,14 @@ static size_t can_get_size(const struct net_device *dev)
 	size_t size;
 
 	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 += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */
-	size += sizeof(struct can_clock);     /* IFLA_CAN_CLOCK */
+	size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */
+	size += nla_total_size(sizeof(struct can_clock));     /* IFLA_CAN_CLOCK */
 	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 */
-		size += sizeof(struct can_bittiming_const);
+		size += nla_total_size(sizeof(struct can_bittiming_const));
 
 	return size;
 }
-- 
1.8.4.rc3


^ permalink raw reply related	[flat|nested] 6+ messages in thread