scsi: scsi_transport_fc: fix NULL pointer dereference in fc_bsg_job_timeout

Christoph Hellwig · martinkpetersen · commit b468b6a4969f · 2017-09-14T20:40:58.000-04:00
bsg-lib now embeddeds the job structure into the request, and
req-&gt;special can't be used anymore.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Cc: stable@vger.kernel.org
Reviewed-by: Ming Lei &lt;ming.lei@redhat.com&gt;
Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
@@ -3571,7 +3571,7 @@ fc_vport_sched_delete(struct work_struct *work)
 static enum blk_eh_timer_return
 fc_bsg_job_timeout(struct request *req)
 {
-	struct bsg_job *job = (void *) req->special;
+	struct bsg_job *job = blk_mq_rq_to_pdu(req);
 	struct Scsi_Host *shost = fc_bsg_to_shost(job);
 	struct fc_rport *rport = fc_bsg_to_rport(job);
 	struct fc_internal *i = to_fc_internal(shost->transportt);

Original file line number	Diff line number	Diff line change
`@@ -3571,7 +3571,7 @@ fc_vport_sched_delete(struct work_struct *work)`
`3571`	`3571`	`static enum blk_eh_timer_return`
`3572`	`3572`	`fc_bsg_job_timeout(struct request *req)`
`3573`	`3573`	`{`
`3574`		`- struct bsg_job job = (void ) req->special;`
	`3574`	`+ struct bsg_job *job = blk_mq_rq_to_pdu(req);`
`3575`	`3575`	`struct Scsi_Host *shost = fc_bsg_to_shost(job);`
`3576`	`3576`	`struct fc_rport *rport = fc_bsg_to_rport(job);`
`3577`	`3577`	`struct fc_internal *i = to_fc_internal(shost->transportt);`