lkml.org 
[lkml]   [2014]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 24/65] bridge: multicast: add sanity check for general query destination
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>

    [ Upstream commit 9ed973cc40c588abeaa58aea0683ea665132d11d ]

    General IGMP and MLD queries are supposed to have the multicast
    link-local all-nodes address as their destination according to RFC2236
    section 9, RFC3376 section 4.1.12/9.1, RFC2710 section 8 and RFC3810
    section 5.1.15.

    Without this check, such malformed IGMP/MLD queries can result in a
    denial of service: The queries are ignored by most IGMP/MLD listeners
    therefore they will not respond with an IGMP/MLD report. However,
    without this patch these malformed MLD queries would enable the
    snooping part in the bridge code, potentially shutting down the
    according ports towards these hosts for multicast traffic as the
    bridge did not learn about these listeners.

    Reported-by: Jan Stancek <jstancek@redhat.com>
    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/bridge/br_multicast.c | 19 +++++++++++++++++++
    1 file changed, 19 insertions(+)

    --- a/net/bridge/br_multicast.c
    +++ b/net/bridge/br_multicast.c
    @@ -1181,6 +1181,14 @@ static int br_ip4_multicast_query(struct
    IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE) : 1;
    }

    + /* RFC2236+RFC3376 (IGMPv2+IGMPv3) require the multicast link layer
    + * all-systems destination addresses (224.0.0.1) for general queries
    + */
    + if (!group && iph->daddr != htonl(INADDR_ALLHOSTS_GROUP)) {
    + err = -EINVAL;
    + goto out;
    + }
    +
    br_multicast_query_received(br, port, &br->ip4_querier, !!iph->saddr,
    max_delay);

    @@ -1228,6 +1236,7 @@ static int br_ip6_multicast_query(struct
    unsigned long max_delay;
    unsigned long now = jiffies;
    const struct in6_addr *group = NULL;
    + bool is_general_query;
    int err = 0;

    spin_lock(&br->multicast_lock);
    @@ -1262,6 +1271,16 @@ static int br_ip6_multicast_query(struct
    max_delay = max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL);
    }

    + is_general_query = group && ipv6_addr_any(group);
    +
    + /* RFC2710+RFC3810 (MLDv1+MLDv2) require the multicast link layer
    + * all-nodes destination address (ff02::1) for general queries
    + */
    + if (is_general_query && !ipv6_addr_is_ll_all_nodes(&ip6h->daddr)) {
    + err = -EINVAL;
    + goto out;
    + }
    +
    br_multicast_query_received(br, port, &br->ip6_querier,
    !ipv6_addr_any(&ip6h->saddr), max_delay);


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-04-11 19:21    [W:2.343 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site