linux-kernel - Re: [PATCH 1/3] target: remove iscsit_find_cmd_from_itt_or

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sat, 06 Jul 2013 17:52:45 -0700
From:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
To:	Joern Engel <joern@...fs.org>
Cc:	linux-kernel@...r.kernel.org,
	target-devel <target-devel@...r.kernel.org>
Subject: Re: [PATCH 1/3] target: remove iscsit_find_cmd_from_itt_or_dump()

On Wed, 2013-07-03 at 11:22 -0400, Joern Engel wrote:
> Code is a copy of iscsit_find_cmd_from_itt().  Afaics this is debug code
> from at least two years ago.  Either the bug in question has been long
> fixed or this debug code doesn't help fixing it.  Whichever way you look
> at it, we should remove the debug code.
> 
> Signed-off-by: Joern Engel <joern@...fs.org>
> ---

NAK on this one.

iscsit_handle_data_out() is expected to dump the incoming per
ISCSI_OP_SCSI_DATA_OUT payload for allowing existing code to determine
the next PDU header to process after this specific 'ITT not found'
exception case occurs.

Otherwise, the traditional iscsi connection will need to be reset when
the remaining DATA_OUT payload_length is not cleared from conn_sock.

--nab

>  drivers/target/iscsi/iscsi_target.c      |    3 +--
>  drivers/target/iscsi/iscsi_target_util.c |   24 ------------------------
>  drivers/target/iscsi/iscsi_target_util.h |    2 --
>  3 files changed, 1 insertion(+), 28 deletions(-)
> 
> diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
> index 7ea246a..49346b3 100644
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@ -1213,8 +1213,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
>  					buf, conn);
>  	}
>  
> -	cmd = iscsit_find_cmd_from_itt_or_dump(conn, hdr->itt,
> -			payload_length);
> +	cmd = iscsit_find_cmd_from_itt(conn, hdr->itt);
>  	if (!cmd)
>  		return 0;
>  
> diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
> index 7ce3505..e59dec0 100644
> --- a/drivers/target/iscsi/iscsi_target_util.c
> +++ b/drivers/target/iscsi/iscsi_target_util.c
> @@ -369,30 +369,6 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt(
>  	return NULL;
>  }
>  
> -struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump(
> -	struct iscsi_conn *conn,
> -	itt_t init_task_tag,
> -	u32 length)
> -{
> -	struct iscsi_cmd *cmd;
> -
> -	spin_lock_bh(&conn->cmd_lock);
> -	list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
> -		if (cmd->init_task_tag == init_task_tag) {
> -			spin_unlock_bh(&conn->cmd_lock);
> -			return cmd;
> -		}
> -	}
> -	spin_unlock_bh(&conn->cmd_lock);
> -
> -	pr_err("Unable to locate ITT: 0x%08x on CID: %hu,"
> -			" dumping payload\n", init_task_tag, conn->cid);
> -	if (length)
> -		iscsit_dump_data_payload(conn, length, 1);
> -
> -	return NULL;
> -}
> -
>  struct iscsi_cmd *iscsit_find_cmd_from_ttt(
>  	struct iscsi_conn *conn,
>  	u32 targ_xfer_tag)
> diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h
> index 894d0f8..9614cb9 100644
> --- a/drivers/target/iscsi/iscsi_target_util.h
> +++ b/drivers/target/iscsi/iscsi_target_util.h
> @@ -15,8 +15,6 @@ extern struct iscsi_r2t *iscsit_get_holder_for_r2tsn(struct iscsi_cmd *, u32);
>  int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, __be32 cmdsn);
>  extern int iscsit_check_unsolicited_dataout(struct iscsi_cmd *, unsigned char *);
>  extern struct iscsi_cmd *iscsit_find_cmd_from_itt(struct iscsi_conn *, itt_t);
> -extern struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *,
> -			itt_t, u32);
>  extern struct iscsi_cmd *iscsit_find_cmd_from_ttt(struct iscsi_conn *, u32);
>  extern int iscsit_find_cmd_for_recovery(struct iscsi_session *, struct iscsi_cmd **,
>  			struct iscsi_conn_recovery **, itt_t);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/