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 09/87] net: vlan: fix nlmsg size calculation in vlan_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 c33a39c575068c2ea9bffb22fd6de2df19c74b89 ]

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

    Cc: Patrick McHardy <kaber@trash.net>
    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>
    ---
    net/8021q/vlan_netlink.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
    index 235c219..c705612 100644
    --- a/net/8021q/vlan_netlink.c
    +++ b/net/8021q/vlan_netlink.c
    @@ -152,7 +152,7 @@ static size_t vlan_get_size(const struct net_device *dev)
    struct vlan_dev_info *vlan = vlan_dev_info(dev);

    return nla_total_size(2) + /* IFLA_VLAN_ID */
    - sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */
    + nla_total_size(sizeof(struct ifla_vlan_flags)) + /* IFLA_VLAN_FLAGS */
    vlan_qos_map_size(vlan->nr_ingress_mappings) +
    vlan_qos_map_size(vlan->nr_egress_mappings);
    }


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