From: Christoph Hellwig <hch@lst.de>
Date: Thu, 1 May 2014 14:51:05 +0000 (+0200)
Subject: scsi: handle command allocation failure in scsi_reset_provider
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95eeb5f5880cd390fd59710f64dc7b84d1e9942f;p=linux-beck.git

scsi: handle command allocation failure in scsi_reset_provider

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nicholas Bellinger <nab@linux-iscsi.org>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index f17aa7aa7879..abe51eab3dc6 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -2306,6 +2306,12 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
 	}
 
 	scmd = scsi_get_command(dev, GFP_KERNEL);
+	if (!scmd) {
+		rtn = FAILED;
+		put_device(&dev->sdev_gendev);
+		goto out_put_autopm_host;
+	}
+
 	blk_rq_init(NULL, &req);
 	scmd->request = &req;