lkml.org 
[lkml]   [2013]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 07/87] can: dev: fix nlmsg size calculation in can_get_size()
    3.2.53-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marc Kleine-Budde <mkl@pengutronix.de>

    [ 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: Ben Hutchings <ben@decadent.org.uk>
    ---
    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 a319057..de87f82 100644
    --- a/drivers/net/can/dev.c
    +++ b/drivers/net/can/dev.c
    @@ -658,14 +658,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;
    }


    \
     
     \ /
      Last update: 2013-11-26 02:21    [W:5.516 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site