From: Andy Grover <agrover@xxxxxxxxxx>
dev->transport->get_cdb(task) should just be returning a pointer to
the cdb space that's already allocated in the task, so it should never
be NULL.
Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/target/target_core_transport.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index d5df995..c01a81b 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -4648,12 +4648,15 @@ static u32 transport_generic_get_cdb_count(
dev->se_sub_dev->se_dev_attrib.block_size);
cdb = dev->transport->get_cdb(task);
- if ((cdb)) {
- memcpy(cdb, cmd->t_task.t_task_cdb,
- scsi_command_size(cmd->t_task.t_task_cdb));
- cmd->transport_split_cdb(task->task_lba,
- &task->task_sectors, cdb);
- }
+ /* Should be part of task, can't fail */
+ BUG_ON(!cdb);
+
+ memcpy(cdb, cmd->t_task.t_task_cdb,
+ scsi_command_size(cmd->t_task.t_task_cdb));
+
+ /* Update new cdb with updated lba/sectors */
+ cmd->transport_split_cdb(task->task_lba,
+ &task->task_sectors, cdb);
/*
* Perform the SE OBJ plugin and/or Transport plugin specific
@@ -4719,9 +4722,9 @@ transport_map_control_cmd_to_task(struct se_cmd *cmd)
return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
cdb = dev->transport->get_cdb(task);
- if (cdb)
- memcpy(cdb, cmd->t_task.t_task_cdb,
- scsi_command_size(cmd->t_task.t_task_cdb));
+ BUG_ON(!cdb);
+ memcpy(cdb, cmd->t_task.t_task_cdb,
+ scsi_command_size(cmd->t_task.t_task_cdb));
task->task_size = cmd->data_length;
task->task_sg_num =
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
