]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
authorEric Dumazet <edumazet@google.com>
Tue, 5 Oct 2021 01:05:07 +0000 (18:05 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 12 Nov 2021 13:07:29 +0000 (14:07 +0100)
BugLink: https://bugs.launchpad.net/bugs/1950014
[ Upstream commit dbe0b88064494b7bb6a9b2aa7e085b14a3112d44 ]

bridge_fill_linkxstats() is using nla_reserve_64bit().

We must use nla_total_size_64bit() instead of nla_total_size()
for corresponding data structure.

Fixes: 1080ab95e3c7 ("net: bridge: add support for IGMP/MLD stats and export them via netlink")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Nikolay Aleksandrov <nikolay@nvidia.com>
Cc: Vivien Didelot <vivien.didelot@gmail.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/bridge/br_netlink.c

index 8a664148f57aaa517d3c4e531acb471115deb5bd..cbcbc19efcb34fa7f2d580bf360570ed1cc0fd60 100644 (file)
@@ -1536,7 +1536,7 @@ static size_t br_get_linkxstats_size(const struct net_device *dev, int attr)
        }
 
        return numvls * nla_total_size(sizeof(struct bridge_vlan_xstats)) +
-              nla_total_size(sizeof(struct br_mcast_stats)) +
+              nla_total_size_64bit(sizeof(struct br_mcast_stats)) +
               nla_total_size(0);
 }