|
 |
383d26 |
From cb9d3b91772324bb697a0f3b89ecc181f59629e2 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Fam Zheng <famz@redhat.com>
|
|
|
383d26 |
Date: Fri, 29 Jun 2018 06:11:52 +0200
|
|
|
383d26 |
Subject: [PATCH 48/57] iscsi: Don't blindly use designator length in response
|
|
|
383d26 |
for memcpy
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
383d26 |
Message-id: <20180629061153.12687-13-famz@redhat.com>
|
|
|
383d26 |
Patchwork-id: 81162
|
|
|
383d26 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH v2 12/13] iscsi: Don't blindly use designator length in response for memcpy
|
|
|
383d26 |
Bugzilla: 1482537
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
Per SCSI definition the designator_length we receive from INQUIRY is 8,
|
|
|
383d26 |
12 or at most 16, but we should be careful because the remote iscsi
|
|
|
383d26 |
target may misbehave, otherwise we could have a buffer overflow.
|
|
|
383d26 |
|
|
|
383d26 |
Reported-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
block/iscsi.c | 2 +-
|
|
|
383d26 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
|
383d26 |
index fbcd5bb..751884d 100644
|
|
|
383d26 |
--- a/block/iscsi.c
|
|
|
383d26 |
+++ b/block/iscsi.c
|
|
|
383d26 |
@@ -2226,7 +2226,7 @@ static void iscsi_populate_target_desc(unsigned char *desc, IscsiLun *lun)
|
|
|
383d26 |
desc[5] = (dd->designator_type & 0xF)
|
|
|
383d26 |
| ((dd->association & 3) << 4);
|
|
|
383d26 |
desc[7] = dd->designator_length;
|
|
|
383d26 |
- memcpy(desc + 8, dd->designator, dd->designator_length);
|
|
|
383d26 |
+ memcpy(desc + 8, dd->designator, MIN(dd->designator_length, 20));
|
|
|
383d26 |
|
|
|
383d26 |
desc[28] = 0;
|
|
|
383d26 |
desc[29] = (lun->block_size >> 16) & 0xFF;
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|