Skip to content

Commit abd4278

Browse files
Zhenzhong Duanbroonie
authored andcommitted
spi: spidev: fix a race between spidev_release and spidev_remove
Imagine below scene, spidev is referenced after it's freed. spidev_release() spidev_remove() ... spin_lock_irq(&spidev->spi_lock); spidev->spi = NULL; spin_unlock_irq(&spidev->spi_lock); mutex_lock(&device_list_lock); dofree = (spidev->spi == NULL); if (dofree) kfree(spidev); mutex_unlock(&device_list_lock); mutex_lock(&device_list_lock); list_del(&spidev->device_entry); device_destroy(spidev_class, spidev->devt); clear_bit(MINOR(spidev->devt), minors); if (spidev->users == 0) kfree(spidev); mutex_unlock(&device_list_lock); Fix it by resetting spidev->spi in device_list_lock's protection. Signed-off-by: Zhenzhong Duan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 35700e2 commit abd4278

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/spi/spidev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,13 +787,13 @@ static int spidev_remove(struct spi_device *spi)
787787
{
788788
struct spidev_data *spidev = spi_get_drvdata(spi);
789789

790+
/* prevent new opens */
791+
mutex_lock(&device_list_lock);
790792
/* make sure ops on existing fds can abort cleanly */
791793
spin_lock_irq(&spidev->spi_lock);
792794
spidev->spi = NULL;
793795
spin_unlock_irq(&spidev->spi_lock);
794796

795-
/* prevent new opens */
796-
mutex_lock(&device_list_lock);
797797
list_del(&spidev->device_entry);
798798
device_destroy(spidev_class, spidev->devt);
799799
clear_bit(MINOR(spidev->devt), minors);

0 commit comments

Comments
 (0)