Skip to content

Commit

Permalink
iscsi: Don't blindly use designator length in response for memcpy
Browse files Browse the repository at this point in the history
Per SCSI definition the designator_length we receive from INQUIRY is 8,
12 or at most 16, but we should be careful because the remote iscsi
target may misbehave, otherwise we could have a buffer overflow.

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
Fam Zheng authored and kevmw committed Jun 29, 2018
1 parent e06f463 commit 1439b9c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion block/iscsi.c
Expand Up @@ -2226,7 +2226,7 @@ static void iscsi_populate_target_desc(unsigned char *desc, IscsiLun *lun)
desc[5] = (dd->designator_type & 0xF)
| ((dd->association & 3) << 4);
desc[7] = dd->designator_length;
memcpy(desc + 8, dd->designator, dd->designator_length);
memcpy(desc + 8, dd->designator, MIN(dd->designator_length, 20));

desc[28] = 0;
desc[29] = (lun->block_size >> 16) & 0xFF;
Expand Down

0 comments on commit 1439b9c

Please sign in to comment.