Commit ea240cfe authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Greg Kroah-Hartman

sd: get disk reference in sd_check_events()

commit eb72d0bb upstream.

sd_check_events() is called asynchronously, and might race
with device removal. So always take a disk reference when
processing the event to avoid the device being removed while
the event is processed.
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Cc: Jinpu Wang <jinpu.wang@profitbricks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33950b56
...@@ -1398,11 +1398,15 @@ static int media_not_present(struct scsi_disk *sdkp, ...@@ -1398,11 +1398,15 @@ static int media_not_present(struct scsi_disk *sdkp,
**/ **/
static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
{ {
struct scsi_disk *sdkp = scsi_disk(disk); struct scsi_disk *sdkp = scsi_disk_get(disk);
struct scsi_device *sdp = sdkp->device; struct scsi_device *sdp;
struct scsi_sense_hdr *sshdr = NULL; struct scsi_sense_hdr *sshdr = NULL;
int retval; int retval;
if (!sdkp)
return 0;
sdp = sdkp->device;
SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n")); SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n"));
/* /*
...@@ -1459,6 +1463,7 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) ...@@ -1459,6 +1463,7 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
kfree(sshdr); kfree(sshdr);
retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0; retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
sdp->changed = 0; sdp->changed = 0;
scsi_disk_put(sdkp);
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment