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

Commit 8c870379 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Clear I2C adapter structure in falcon_remove_nic() 



i2c_del_adapter() leaves dangling pointers in the structure.  If we
retry the NIC probe and pass the structure to i2c_add_adapter() again
it will lead to an oops unless we clear it first.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 115122af

drivers/net/sfc/falcon.c

+2 −0
Original line number Diff line number Diff line
@@ -3114,8 +3114,10 @@ void falcon_remove_nic(struct efx_nic *efx) 
	struct falcon_nic_data *nic_data = efx->nic_data;

	int rc;



	/* Remove I2C adapter and clear it in preparation for a retry */

	rc = i2c_del_adapter(&efx->i2c_adap);

	BUG_ON(rc);

	memset(&efx->i2c_adap, 0, sizeof(efx->i2c_adap));



	falcon_remove_spi_devices(efx);

	falcon_free_buffer(efx, &efx->irq_status);