diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-10-07 23:19:58 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-11-28 14:01:57 +0000 |
| commit | 98459c1ed3af5d9240be460baf3ac6415d2a2dfe (patch) | |
| tree | 9e9a983dfa640802936f3d1d12e67d26d852bb83 /net/8021q | |
| parent | 75770c94c91d6d637d95d70062fc67a1c468003a (diff) | |
| download | kernel_samsung_smdk4412-98459c1ed3af5d9240be460baf3ac6415d2a2dfe.zip kernel_samsung_smdk4412-98459c1ed3af5d9240be460baf3ac6415d2a2dfe.tar.gz kernel_samsung_smdk4412-98459c1ed3af5d9240be460baf3ac6415d2a2dfe.tar.bz2 | |
net: vlan: fix nlmsg size calculation in vlan_get_size()
[ 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>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |