Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea160b3 authored by Roland Dreier's avatar Roland Dreier Committed by Nicholas Bellinger
Browse files

target: Fix handling of aborted commands 



- If we stop processing an already-aborted command in
  target_execute_cmd(), then we need to complete t_transport_stop_comp
  to wake up the the TMR handling thread, or else it will end up
  waiting forever.

- If we've a already sent an "aborted" status for a command in
  transport_check_aborted_status() then we should bail out of
  transport_send_task_abort() to avoid freeing the command twice.

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@risingtidesystems.com>
parent 3d70f8c6

drivers/target/target_core_transport.c

+4 −2
Original line number Diff line number Diff line
@@ -1819,8 +1819,10 @@ void target_execute_cmd(struct se_cmd *cmd) 
	/*

	 * If the received CDB has aleady been aborted stop processing it here.

	 */

	if (transport_check_aborted_status(cmd, 1))

	if (transport_check_aborted_status(cmd, 1)) {

		complete(&cmd->t_transport_stop_comp);

		return;

	}



	/*

	 * Determine if IOCTL context caller in requesting the stopping of this
@@ -3067,7 +3069,7 @@ void transport_send_task_abort(struct se_cmd *cmd) 
	unsigned long flags;



	spin_lock_irqsave(&cmd->t_state_lock, flags);

	if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {

	if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION | SCF_SENT_DELAYED_TAS)) {

		spin_unlock_irqrestore(&cmd->t_state_lock, flags);

		return;

	}