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

Commit a1434939 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "spi: fix use-after-free of the add_lock mutex" 



This reverts commit 54c2c96e which is
commit 6c53b45c71b4920b5e62f0ea8079a1da382b9434 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Icce07d26ecdbeb799b479babd47730046b402902
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent da1a7795

drivers/spi/spi.c

+7 −7
Original line number Diff line number Diff line
@@ -2674,6 +2674,13 @@ void spi_unregister_controller(struct spi_controller *ctlr) 


	device_del(&ctlr->dev);



	/* Release the last reference on the controller if its driver

	 * has not yet been converted to devm_spi_alloc_master/slave().

	 */

	if (!devres_find(ctlr->dev.parent, devm_spi_release_controller,

			 devm_spi_match_controller, ctlr))

		put_device(&ctlr->dev);



	/* free bus id */

	mutex_lock(&board_lock);

	if (found == ctlr)
@@ -2682,13 +2689,6 @@ void spi_unregister_controller(struct spi_controller *ctlr) 


	if (IS_ENABLED(CONFIG_SPI_DYNAMIC))

		mutex_unlock(&ctlr->add_lock);



	/* Release the last reference on the controller if its driver

	 * has not yet been converted to devm_spi_alloc_master/slave().

	 */

	if (!devres_find(ctlr->dev.parent, devm_spi_release_controller,

			 devm_spi_match_controller, ctlr))

		put_device(&ctlr->dev);

}

EXPORT_SYMBOL_GPL(spi_unregister_controller);