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

Commit b5479167 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix locking in drive_release_dev() 



* Request queue cleanup should happen before freeing drive->id
  and marking device as non-present.  Fix it.

* Remove superfluous hwif->lock acquiring/releasing.

Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 4465461e

drivers/ide/ide-probe.c

+4 −8
Original line number Diff line number Diff line
@@ -942,20 +942,16 @@ EXPORT_SYMBOL_GPL(ide_init_disk); 
static void drive_release_dev (struct device *dev)

{

	ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);

	ide_hwif_t *hwif = drive->hwif;



	ide_proc_unregister_device(drive);



	spin_lock_irq(&hwif->lock);

	blk_cleanup_queue(drive->queue);

	drive->queue = NULL;



	kfree(drive->id);

	drive->id = NULL;



	drive->dev_flags &= ~IDE_DFLAG_PRESENT;

	/* Messed up locking ... */

	spin_unlock_irq(&hwif->lock);

	blk_cleanup_queue(drive->queue);

	spin_lock_irq(&hwif->lock);

	drive->queue = NULL;

	spin_unlock_irq(&hwif->lock);



	complete(&drive->gendev_rel_comp);

}