Commit 2053a1db authored Oct 08, 2013 by Roland Dreier Committed by Nicholas Bellinger Oct 09, 2013

target: Fix assignment of LUN in tracepoints



The unpacked_lun field in the SCSI target tracepoints should be
initialized with cmd->orig_fe_lun rather than cmd->se_lun->unpacked_lun
for two reasons:

 - most importantly, if we are in the cmd_complete tracepoint
   returning a check condition due to no LUN found, cmd->se_lun will
   be NULL and we'll crash trying to dereference it.

 - also, in any case, cmd->se_lun->unpacked_lun is an internal index
   into the target's internal set of LUNs; cmd->orig_fe_lun is much
   more useful and interesting, since it's the value the initiator
   actually sent.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Cc: <stable@vger.kernel.org> # 3.11+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

parent acb3f260

include/trace/events/target.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ TRACE_EVENT(target_sequencer_start,
		),

		TP_fast_assign(
		__entry->unpacked_lun = cmd->se_lun->unpacked_lun;
		__entry->unpacked_lun = cmd->orig_fe_lun;
		__entry->opcode = cmd->t_task_cdb[0];
		__entry->data_length = cmd->data_length;
		__entry->task_attribute = cmd->sam_task_attr;
		@@ -182,7 +182,7 @@ TRACE_EVENT(target_cmd_complete,
		),

		TP_fast_assign(
		__entry->unpacked_lun = cmd->se_lun->unpacked_lun;
		__entry->unpacked_lun = cmd->orig_fe_lun;
		__entry->opcode = cmd->t_task_cdb[0];
		__entry->data_length = cmd->data_length;
		__entry->task_attribute = cmd->sam_task_attr;