Skip to content

Commit ddbe16b

Browse files
James Bottomleygregkh
authored andcommitted
53c700: fix BUG on untagged commands
commit 8beb330044d0d1878c7b92290e91c0b889e92633 upstream. The untagged command case in the 53c700 driver has been broken since host wide tags were enabled because the replaced scsi_find_tag() function had a special case for the tag value SCSI_NO_TAG to retrieve sdev->current_cmnd. The replacement function scsi_host_find_tag() has no such special case and returns NULL causing untagged commands to trigger a BUG() in the driver. Inspection shows that the 53c700 is the only driver using this SCSI_NO_TAG case, so a local fix in the driver suffices to fix this problem globally. Fixes: 64d513a - "scsi: use host wide tags by default" Reported-by: Helge Deller <deller@gmx.de> Tested-by: Helge Deller <deller@gmx.de> Signed-off-by: James Bottomley <jejb@linux.vnet.ibm.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Ewan D. Milne <emilne@redhat.com> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 333e71c commit ddbe16b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/scsi/53c700.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,
11221122
} else {
11231123
struct scsi_cmnd *SCp;
11241124

1125-
SCp = scsi_host_find_tag(SDp->host, SCSI_NO_TAG);
1125+
SCp = SDp->current_cmnd;
11261126
if(unlikely(SCp == NULL)) {
11271127
sdev_printk(KERN_ERR, SDp,
11281128
"no saved request for untagged cmd\n");
@@ -1826,7 +1826,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
18261826
slot->tag, slot);
18271827
} else {
18281828
slot->tag = SCSI_NO_TAG;
1829-
/* must populate current_cmnd for scsi_host_find_tag to work */
1829+
/* save current command for reselection */
18301830
SCp->device->current_cmnd = SCp;
18311831
}
18321832
/* sanity check: some of the commands generated by the mid-layer

0 commit comments

Comments
 (0)