Commit 71d9f614 authored May 28, 2015 by Eric Dumazet Committed by David S. Miller May 30, 2015

bridge: fix br_multicast_query_expired() bug



br_multicast_query_expired() querier argument is a pointer to
a struct bridge_mcast_querier :

struct bridge_mcast_querier {
        struct br_ip addr;
        struct net_bridge_port __rcu    *port;
};

Intent of the code was to clear port field, not the pointer to querier.

Fixes: 2cd41431 ("bridge: memorize and export selected IGMP/MLD querier port")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
Cc: Linus Lüssing <linus.luessing@web.de>
Cc: Steinar H. Gunderson <sesse@samfundet.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5aab0e8a

net/bridge/br_multicast.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1822,7 +1822,7 @@ static void br_multicast_query_expired(struct net_bridge *br,
		if (query->startup_sent < br->multicast_startup_query_count)
		query->startup_sent++;

		RCU_INIT_POINTER(querier, NULL);
		RCU_INIT_POINTER(querier->port, NULL);
		br_multicast_send_query(br, NULL, query);
		spin_unlock(&br->multicast_lock);
		}