lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 420/421] net: bridge: multicast: fix PIM hello router port marking race
    Date
    From: Nikolay Aleksandrov <nikolay@nvidia.com>

    commit 04bef83a3358946bfc98a5ecebd1b0003d83d882 upstream.

    When a PIM hello packet is received on a bridge port with multicast
    snooping enabled, we mark it as a router port automatically, that
    includes adding that port the router port list. The multicast lock
    protects that list, but it is not acquired in the PIM message case
    leading to a race condition, we need to take it to fix the race.

    Cc: stable@vger.kernel.org
    Fixes: 91b02d3d133b ("bridge: mcast: add router port on PIM hello message")
    Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/bridge/br_multicast.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/net/bridge/br_multicast.c
    +++ b/net/bridge/br_multicast.c
    @@ -1791,7 +1791,9 @@ static void br_multicast_pim(struct net_
    pim_hdr_type(pimhdr) != PIM_TYPE_HELLO)
    return;

    + spin_lock(&br->multicast_lock);
    br_multicast_mark_router(br, port);
    + spin_unlock(&br->multicast_lock);
    }

    static int br_multicast_ipv4_rcv(struct net_bridge *br,

    \
     
     \ /
      Last update: 2021-07-19 19:11    [W:4.043 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site