Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 045de01a authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

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: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ca94183

net/core/rtnetlink.c

+6 −5
Original line number Diff line number Diff line
@@ -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;