Commit 1b6d9935 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: mcast: Account for missing attributes 



The 'MDBA_MDB' and 'MDBA_MDB_ENTRY' nest attributes are not accounted
for when calculating the size of MDB notifications. Add them along with
comments for existing attributes.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9109b5b

net/bridge/br_mdb.c

+11 −4
Original line number Diff line number Diff line
@@ -452,11 +452,18 @@ static int nlmsg_populate_mdb_fill(struct sk_buff *skb, 


static size_t rtnl_mdb_nlmsg_size(struct net_bridge_port_group *pg)

{

	size_t nlmsg_size = NLMSG_ALIGN(sizeof(struct br_port_msg)) +

	struct net_bridge_group_src *ent;

	size_t nlmsg_size, addr_size = 0;



	nlmsg_size = NLMSG_ALIGN(sizeof(struct br_port_msg)) +

		     /* MDBA_MDB */

		     nla_total_size(0) +

		     /* MDBA_MDB_ENTRY */

		     nla_total_size(0) +

		     /* MDBA_MDB_ENTRY_INFO */

		     nla_total_size(sizeof(struct br_mdb_entry)) +

		     /* MDBA_MDB_EATTR_TIMER */

		     nla_total_size(sizeof(u32));

	struct net_bridge_group_src *ent;

	size_t addr_size = 0;



	if (!pg)

		goto out;