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

Commit bb53f4d4 authored by Martin Habets's avatar Martin Habets Committed by David S. Miller
Browse files

sfc: Fix MCDI command size for filter operations 



The 8000 series adapters uses catch-all filters for encapsulated traffic
to support filtering VXLAN, NVGRE and GENEVE traffic.
This new filter functionality requires a longer MCDI command.
This patch increases the size of buffers on stack that were missed, which
fixes a kernel panic from the stack protector.

Fixes: 9b410801 ("sfc: insert catch-all filters for encapsulated traffic")
Signed-off-by: default avatarMartin Habets <mhabets@solarflare.com>
Acked-by: default avatarEdward Cree <ecree@solarflare.com>
Acked-by: default avatarBert Kenward <bkenward@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b92b7d33

drivers/net/ethernet/sfc/ef10.c

+4 −4
Original line number Diff line number Diff line
@@ -4172,7 +4172,7 @@ static s32 efx_ef10_filter_insert(struct efx_nic *efx, 
	 * recipients

	 */

	if (is_mc_recip) {

		MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_IN_LEN);

		MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_EXT_IN_LEN);

		unsigned int depth, i;



		memset(inbuf, 0, sizeof(inbuf));
@@ -4320,7 +4320,7 @@ static int efx_ef10_filter_remove_internal(struct efx_nic *efx, 
			efx_ef10_filter_set_entry(table, filter_idx, NULL, 0);

		} else {

			efx_mcdi_display_error(efx, MC_CMD_FILTER_OP,

					       MC_CMD_FILTER_OP_IN_LEN,

					       MC_CMD_FILTER_OP_EXT_IN_LEN,

					       NULL, 0, rc);

		}

	}
@@ -4453,7 +4453,7 @@ static s32 efx_ef10_filter_rfs_insert(struct efx_nic *efx, 
				      struct efx_filter_spec *spec)

{

	struct efx_ef10_filter_table *table = efx->filter_state;

	MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_IN_LEN);

	MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_EXT_IN_LEN);

	struct efx_filter_spec *saved_spec;

	unsigned int hash, i, depth = 1;

	bool replacing = false;
@@ -4940,7 +4940,7 @@ static void efx_ef10_filter_table_restore(struct efx_nic *efx) 
static void efx_ef10_filter_table_remove(struct efx_nic *efx)

{

	struct efx_ef10_filter_table *table = efx->filter_state;

	MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_IN_LEN);

	MCDI_DECLARE_BUF(inbuf, MC_CMD_FILTER_OP_EXT_IN_LEN);

	struct efx_filter_spec *spec;

	unsigned int filter_idx;

	int rc;