OSDN Git Service

IB/iser: Fix wrong calculation of protection buffer length
authorSagi Grimberg <sagig@mellanox.com>
Tue, 14 Apr 2015 15:08:13 +0000 (18:08 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:04:01 +0000 (22:04 +0200)
commit a065fe6aa25ba6ba93c02dc13486131bb3c64d5f upstream.

This length miss-calculation may cause a silent data corruption
in the DIX case and cause the device to reference unmapped area.

Fixes: d77e65350f2d ('libiscsi, iser: Adjust data_length to include protection information')
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/infiniband/ulp/iser/iser_initiator.c

index 20e859a..76eb57b 100644 (file)
@@ -409,8 +409,8 @@ int iser_send_command(struct iscsi_conn *conn,
        if (scsi_prot_sg_count(sc)) {
                prot_buf->buf  = scsi_prot_sglist(sc);
                prot_buf->size = scsi_prot_sg_count(sc);
-               prot_buf->data_len = data_buf->data_len >>
-                                    ilog2(sc->device->sector_size) * 8;
+               prot_buf->data_len = (data_buf->data_len >>
+                                    ilog2(sc->device->sector_size)) * 8;
        }
 
        if (hdr->flags & ISCSI_FLAG_CMD_READ) {