diff options
| author | Ido Schimmel <idosch@nvidia.com> | 2023-10-25 14:30:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-27 11:51:41 +0200 |
| commit | 1b6d993509c13d180b2a9fbfe0ebc48e344348df (patch) | |
| tree | d994564120c20730545d05294974855e37bca926 | |
| parent | bridge: mcast: Dump MDB entries even when snooping is disabled (diff) | |
| download | linux-1b6d993509c13d180b2a9fbfe0ebc48e344348df.tar.xz linux-1b6d993509c13d180b2a9fbfe0ebc48e344348df.zip | |
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: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_mdb.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index fb58bb1b60e8..08de94bffc12 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -452,11 +452,18 @@ cancel: static size_t rtnl_mdb_nlmsg_size(struct net_bridge_port_group *pg) { - size_t nlmsg_size = NLMSG_ALIGN(sizeof(struct br_port_msg)) + - nla_total_size(sizeof(struct br_mdb_entry)) + - nla_total_size(sizeof(u32)); struct net_bridge_group_src *ent; - size_t addr_size = 0; + 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)); if (!pg) goto out; |