diff options
| author | Scott Feldman <scofeldm@cisco.com> | 2010-05-28 03:42:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-28 03:42:43 -0700 |
| commit | 045de01a174d9f0734f657eb4b3313d89b4fd5ad (patch) | |
| tree | da3250d65f4851e11446af9df34152144914662d /net/core | |
| parent | 8ca9418350eccd5dd2659931807c1901224dd638 (diff) | |
| download | kernel_samsung_smdk4412-045de01a174d9f0734f657eb4b3313d89b4fd5ad.zip kernel_samsung_smdk4412-045de01a174d9f0734f657eb4b3313d89b4fd5ad.tar.gz kernel_samsung_smdk4412-045de01a174d9f0734f657eb4b3313d89b4fd5ad.tar.bz2 | |
netlink: bug fix: wrong size was calculated for vfinfo list blob
The wrong size was being calculated for vfinfo. In one case, it was over-
calculating using nlmsg_total_size on attrs, in another case, it was
under-calculating by assuming ifla_vf_* structs are packed together, but
each struct is it's own attr w/ hdr (and padding).
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/rtnetlink.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 7331bb2..1a2af24 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -650,11 +650,12 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev) if (dev->dev.parent && dev_is_pci(dev->dev.parent)) { int num_vfs = dev_num_vf(dev->dev.parent); - size_t size = nlmsg_total_size(sizeof(struct nlattr)); - size += nlmsg_total_size(num_vfs * sizeof(struct nlattr)); - size += num_vfs * (sizeof(struct ifla_vf_mac) + - sizeof(struct ifla_vf_vlan) + - sizeof(struct ifla_vf_tx_rate)); + size_t size = nla_total_size(sizeof(struct nlattr)); + size += nla_total_size(num_vfs * sizeof(struct nlattr)); + size += num_vfs * + (nla_total_size(sizeof(struct ifla_vf_mac)) + + nla_total_size(sizeof(struct ifla_vf_vlan)) + + nla_total_size(sizeof(struct ifla_vf_tx_rate))); return size; } else return 0; |