From 20cfd827a1e0c557a80bc6fae68b8323dfb84524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Engel?= Date: Thu, 16 Feb 2012 11:14:27 -0500 Subject: [PATCH] --- yaml --- r: 292842 b: refs/heads/master c: 99f730d88fd0a25c3e2dfc357bde4cf6b8cb5b40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_device.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c23b3b1432a1..eba82cf73eff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47f1b8803e1e358ebbf4f82bfdb98971c912a2c3 +refs/heads/master: 99f730d88fd0a25c3e2dfc357bde4cf6b8cb5b40 diff --git a/trunk/drivers/target/target_core_device.c b/trunk/drivers/target/target_core_device.c index 36fa75da085c..5cfaa4b6da42 100644 --- a/trunk/drivers/target/target_core_device.c +++ b/trunk/drivers/target/target_core_device.c @@ -650,7 +650,7 @@ int target_report_luns(struct se_task *se_task) struct se_lun *se_lun; struct se_session *se_sess = se_cmd->se_sess; unsigned char *buf; - u32 cdb_offset = 0, lun_count = 0, offset = 8, i; + u32 lun_count = 0, offset = 8, i; buf = transport_kmap_data_sg(se_cmd); if (!buf) @@ -679,12 +679,11 @@ int target_report_luns(struct se_task *se_task) * See SPC2-R20 7.19. */ lun_count++; - if ((cdb_offset + 8) >= se_cmd->data_length) + if ((offset + 8) > se_cmd->data_length) continue; int_to_scsilun(deve->mapped_lun, (struct scsi_lun *)&buf[offset]); offset += 8; - cdb_offset += 8; } spin_unlock_irq(&se_sess->se_node_acl->device_list_lock);