Merge pull request #4611 from donaldsharp/7_1_igmp_connected_source

[7.1]pimd: Dissallow query to be received from a non-connected source

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index cdd156b96fa331b428748bce2b71499a93300a16..e614a00311e6aba724930be279f52102bdb122c9 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -305,6 +305,13 @@ static int igmp_recv_query(struct igmp_sock *igmp, int query_version,
                return -1;
        }
 
+       if (!pim_if_connected_to_source(ifp, from)) {
+               if (PIM_DEBUG_IGMP_PACKETS)
+                       zlog_debug("Recv IGMP query on interface: %s from a non-connected source: %s",
+                                  ifp->name, from_str);
+               return 0;
+       }
+
        /* Collecting IGMP Rx stats */
        switch (query_version) {
        case 1: