Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d58299a4 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: fix attempt to translate invalid filter ID 



When filter insertion fails with no rollback, we were trying to convert
 EFX_EF10_FILTER_ID_INVALID to an id to store in 'ids' (which is either
 vlan->uc or vlan->mc).  This would WARN_ON_ONCE and then record a bogus
 filter ID of 0x1fff, neither of which is a good thing.

Fixes: 0ccb998b ("sfc: fix filter_id misinterpretation in edge case")
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e44699d2

drivers/net/ethernet/sfc/ef10.c

+4 −3
Original line number Diff line number Diff line
@@ -5105,6 +5105,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx, 


	/* Insert/renew filters */

	for (i = 0; i < addr_count; i++) {

		EFX_WARN_ON_PARANOID(ids[i] != EFX_EF10_FILTER_ID_INVALID);

		efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);

		efx_filter_set_eth_local(&spec, vlan->vid, addr_list[i].addr);

		rc = efx_ef10_filter_insert(efx, &spec, true);
@@ -5122,12 +5123,12 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx, 
				}

				return rc;

			} else {

				/* mark as not inserted, and carry on */

				rc = EFX_EF10_FILTER_ID_INVALID;

			}

				/* keep invalid ID, and carry on */

			}

		} else {

			ids[i] = efx_ef10_filter_get_unsafe_id(rc);

		}

	}



	if (multicast && rollback) {

		/* Also need an Ethernet broadcast filter */