Commit e7cfcf2c authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Jakub Kicinski
Browse files

net: bridge: multicast: calculate idx position without changing ptr 



We need to preserve the srcs pointer since we'll be passing it for EHT
handling later.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0ad57c99

net/bridge/br_multicast.c

+9 −18
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ static bool br_multicast_isinc_allow(struct net_bridge_port_group *pg, void *h_a 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (!ent) {

			ent = br_multicast_new_group_src(pg, &src_ip);
@@ -1822,7 +1822,6 @@ static bool br_multicast_isinc_allow(struct net_bridge_port_group *pg, void *h_a 


		if (ent)

			__grp_src_mod_timer(ent, now + br_multicast_gmi(br));

		srcs += addr_size;

	}



	return changed;
@@ -1846,7 +1845,7 @@ static void __grp_src_isexc_incl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent)

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -1854,7 +1853,6 @@ static void __grp_src_isexc_incl(struct net_bridge_port_group *pg, void *h_addr, 
			ent = br_multicast_new_group_src(pg, &src_ip);

		if (ent)

			br_multicast_fwd_src_handle(ent);

		srcs += addr_size;

	}



	__grp_src_delete_marked(pg);
@@ -1882,7 +1880,7 @@ static bool __grp_src_isexc_excl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -1894,7 +1892,6 @@ static bool __grp_src_isexc_excl(struct net_bridge_port_group *pg, void *h_addr, 
				changed = true;

			}

		}

		srcs += addr_size;

	}



	if (__grp_src_delete_marked(pg))
@@ -1946,7 +1943,7 @@ static bool __grp_src_toin_incl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_SEND;
@@ -1958,7 +1955,6 @@ static bool __grp_src_toin_incl(struct net_bridge_port_group *pg, void *h_addr, 
		}

		if (ent)

			__grp_src_mod_timer(ent, now + br_multicast_gmi(br));

		srcs += addr_size;

	}



	if (to_send)
@@ -1989,7 +1985,7 @@ static bool __grp_src_toin_excl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			if (timer_pending(&ent->timer)) {
@@ -2003,7 +1999,6 @@ static bool __grp_src_toin_excl(struct net_bridge_port_group *pg, void *h_addr, 
		}

		if (ent)

			__grp_src_mod_timer(ent, now + br_multicast_gmi(br));

		srcs += addr_size;

	}



	if (to_send)
@@ -2050,7 +2045,7 @@ static void __grp_src_toex_incl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags = (ent->flags & ~BR_SGRP_F_DELETE) |
@@ -2061,7 +2056,6 @@ static void __grp_src_toex_incl(struct net_bridge_port_group *pg, void *h_addr, 
		}

		if (ent)

			br_multicast_fwd_src_handle(ent);

		srcs += addr_size;

	}



	__grp_src_delete_marked(pg);
@@ -2090,7 +2084,7 @@ static bool __grp_src_toex_excl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -2105,7 +2099,6 @@ static bool __grp_src_toex_excl(struct net_bridge_port_group *pg, void *h_addr, 
			ent->flags |= BR_SGRP_F_SEND;

			to_send++;

		}

		srcs += addr_size;

	}



	if (__grp_src_delete_marked(pg))
@@ -2156,13 +2149,12 @@ static bool __grp_src_block_incl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags |= BR_SGRP_F_SEND;

			to_send++;

		}

		srcs += addr_size;

	}



	if (to_send)
@@ -2197,7 +2189,7 @@ static bool __grp_src_block_excl(struct net_bridge_port_group *pg, void *h_addr, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->key.addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.src, srcs, addr_size);

		memcpy(&src_ip.src, srcs + (src_idx * addr_size), addr_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (!ent) {

			ent = br_multicast_new_group_src(pg, &src_ip);
@@ -2210,7 +2202,6 @@ static bool __grp_src_block_excl(struct net_bridge_port_group *pg, void *h_addr, 
			ent->flags |= BR_SGRP_F_SEND;

			to_send++;

		}

		srcs += addr_size;

	}



	if (to_send)