]> git.hungrycats.org Git - linux/commitdiff
scsi: fix random memory corruption with scsi-mq + T10 PI
authorTony Battersby <tonyb@cybernetics.com>
Mon, 8 Dec 2014 22:20:52 +0000 (17:20 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jan 2015 16:29:38 +0000 (08:29 -0800)
commit 120bb3e1e36da9c1ae6b978c825a28b944a5d7c5 upstream.

This fixes random memory corruption triggered when all three of the
following are true:

* scsi-mq enabled
* T10 Protection Information (DIF) enabled
* SCSI host with sg_tablesize > SCSI_MAX_SG_SEGMENTS (128)

The symptoms of this bug are unpredictable memory corruption, BUG()s,
oopses, lockups, etc., any of which may appear to be completely
unrelated to the root cause.

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Reviewed-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/scsi_lib.c

index 50a6e1ac8d9cb48419c1547f72226a46543234c9..17fb0518c9c144d36bb73bf5be88bdd3a849f5bd 100644 (file)
@@ -1829,7 +1829,9 @@ static int scsi_mq_prep_fn(struct request *req)
 
        if (scsi_host_get_prot(shost)) {
                cmd->prot_sdb = (void *)sg +
-                       shost->sg_tablesize * sizeof(struct scatterlist);
+                       min_t(unsigned int,
+                             shost->sg_tablesize, SCSI_MAX_SG_SEGMENTS) *
+                       sizeof(struct scatterlist);
                memset(cmd->prot_sdb, 0, sizeof(struct scsi_data_buffer));
 
                cmd->prot_sdb->table.sgl =