diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2020-04-16 12:47:47 +0200 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2020-04-16 17:15:03 +0000 |
| commit | bd7f3422bbe38ba87888b765e94b56bfcbb9602c (patch) | |
| tree | 4d67199d2495f060af0beb4c22cac9c610e7ce9c /src/plugins/igmp/igmp_proxy.c | |
| parent | 063f2b86edafdc17d285bebc7722cad19c885db1 (diff) | |
igmp: fix igmp proxy group merge
When merging proxy groups in igmp_proxy_device_merge_group(), the call
to igmp_proxy_device_merge_src() can end up removing the current proxy
group via igmp_group_clear(). When that happens, it must returns NULL so
that igmp_proxy_device_merge_config() does not send a IGMPv3 report for
a dead proxy group.
Make igmp_group_clear() reset the group pointer to NULL to fix this bug
and to detect similar bugs more easily.
Type: fix
Change-Id: I229e55b5bfa71734d7844893f5209a66fa3cc8ae
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'src/plugins/igmp/igmp_proxy.c')
| -rw-r--r-- | src/plugins/igmp/igmp_proxy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/igmp/igmp_proxy.c b/src/plugins/igmp/igmp_proxy.c index dc2b4c13791..2167740fc8a 100644 --- a/src/plugins/igmp/igmp_proxy.c +++ b/src/plugins/igmp/igmp_proxy.c @@ -246,18 +246,18 @@ igmp_proxy_device_block_src (igmp_config_t * config, igmp_group_t * group, { igmp_proxy_device_mfib_path_add_del (proxy_group, 0); igmp_proxy_device_mfib_path_add_del (group, 0); - igmp_group_clear (proxy_group); + igmp_group_clear (&proxy_group); } } always_inline void -igmp_proxy_device_merge_src (igmp_group_t * proxy_group, igmp_src_t * src, +igmp_proxy_device_merge_src (igmp_group_t ** proxy_group, igmp_src_t * src, ip46_address_t ** srcaddrs, u8 block) { igmp_src_t *proxy_src; u32 d_config; - proxy_src = igmp_src_lookup (proxy_group, src->key); + proxy_src = igmp_src_lookup (*proxy_group, src->key); if (proxy_src == NULL) { @@ -267,11 +267,11 @@ igmp_proxy_device_merge_src (igmp_group_t * proxy_group, igmp_src_t * src, d_config = igmp_group_get (src->group)->config; proxy_src = - igmp_src_alloc (igmp_group_index (proxy_group), src->key, + igmp_src_alloc (igmp_group_index (*proxy_group), src->key, IGMP_MODE_HOST); - hash_set_mem (proxy_group->igmp_src_by_key - [proxy_group->router_filter_mode], proxy_src->key, + hash_set_mem ((*proxy_group)->igmp_src_by_key + [(*proxy_group)->router_filter_mode], proxy_src->key, igmp_src_index (proxy_src)); vec_validate_init_empty (proxy_src->referance_by_config_index, d_config, @@ -299,12 +299,12 @@ igmp_proxy_device_merge_src (igmp_group_t * proxy_group, igmp_src_t * src, vec_add1 (*srcaddrs, *proxy_src->key); - igmp_group_src_remove (proxy_group, proxy_src); + igmp_group_src_remove (*proxy_group, proxy_src); igmp_src_free (proxy_src); - if (igmp_group_n_srcs (proxy_group, IGMP_FILTER_MODE_INCLUDE) == 0) + if (igmp_group_n_srcs (*proxy_group, IGMP_FILTER_MODE_INCLUDE) == 0) { - igmp_proxy_device_mfib_path_add_del (proxy_group, 0); + igmp_proxy_device_mfib_path_add_del (*proxy_group, 0); igmp_group_clear (proxy_group); } return; @@ -348,7 +348,7 @@ igmp_proxy_device_merge_group (igmp_proxy_device_t * proxy_device, /* *INDENT-OFF* */ FOR_EACH_SRC (src, group, group->router_filter_mode, ({ - igmp_proxy_device_merge_src (proxy_group, src, srcaddrs, block); + igmp_proxy_device_merge_src (&proxy_group, src, srcaddrs, block); })); /* *INDENT-ON* */ return proxy_group; |