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

Commit 6fbd42df authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

staging: greybus: spilib: fix use-after-free after deregistration 



commit 770b03c2ca4aa44d226cf248f86aa23e546147d0 upstream.

Remove erroneous spi_master_put() after controller deregistration which
would access the already freed spi controller.

Note that spi_unregister_master() drops our only controller reference.

Fixes: ba3e6700 ("greybus: SPI: convert to a gpbridge driver")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8b5d88d

drivers/staging/greybus/spilib.c

+5 −3
Original line number Diff line number Diff line
@@ -544,11 +544,14 @@ int gb_spilib_master_init(struct gb_connection *connection, struct device *dev, 


	return 0;



exit_spi_unregister:

	spi_unregister_master(master);

exit_spi_put:

	spi_master_put(master);



	return ret;



exit_spi_unregister:

	spi_unregister_master(master);



	return ret;

}

EXPORT_SYMBOL_GPL(gb_spilib_master_init);
@@ -558,7 +561,6 @@ void gb_spilib_master_exit(struct gb_connection *connection) 
	struct spi_master *master = gb_connection_get_data(connection);



	spi_unregister_master(master);

	spi_master_put(master);

}

EXPORT_SYMBOL_GPL(gb_spilib_master_exit);