diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-10-05 21:25:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-04 04:23:40 -0800 |
| commit | bbcb20aaca3bbbfcb8c53c3587620d59320f805f (patch) | |
| tree | 070e03ea7a58bba28e21c5399ee49c05125cf99f | |
| parent | ad61d4c760976880cf5a9f2e14f6cbb487bef59a (diff) | |
| download | lwn-bbcb20aaca3bbbfcb8c53c3587620d59320f805f.tar.gz lwn-bbcb20aaca3bbbfcb8c53c3587620d59320f805f.zip | |
can: dev: fix nlmsg size calculation in can_get_size()
[ Upstream commit fe119a05f8ca481623a8d02efcc984332e612528 ]
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/can/dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index e86f4c37f981..c2cdefa1651e 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -665,14 +665,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; } |