beef0e9
--- a/drivers/scsi/sd.c	
beef0e9
+++ a/drivers/scsi/sd.c	
beef0e9
@@ -2362,13 +2362,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
beef0e9
 static int sd_revalidate_disk(struct gendisk *disk)
beef0e9
 {
beef0e9
 	struct scsi_disk *sdkp = scsi_disk(disk);
beef0e9
-	struct scsi_device *sdp = sdkp->device;
beef0e9
+	struct scsi_device *sdp;
beef0e9
 	unsigned char *buffer;
beef0e9
 	unsigned flush = 0;
beef0e9
 
beef0e9
 	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
beef0e9
 				      "sd_revalidate_disk\n"));
beef0e9
 
b150cfc
+	if (WARN_ONCE((!sdkp), "Invalid scsi_disk from %p\n", disk))
beef0e9
+		goto out;
beef0e9
+
beef0e9
+	sdp = sdkp->device;
beef0e9
+
beef0e9
 	/*
beef0e9
 	 * If the device is offline, don't try and read capacity or any
beef0e9
 	 * of the other niceties.