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

Commit b0d31bbe authored by Jenny Derzhavetz's avatar Jenny Derzhavetz Committed by Greg Kroah-Hartman
Browse files

iser-target: Add new state ISER_CONN_BOUND to isert_conn 



commit aea92980601f7ddfcb3c54caa53a43726314fe46 upstream.

We need an indication that isert_conn->iscsi_conn binding has
happened so we'll know not to invoke a connection reinstatement
on an unbound connection which will lead to a bogus isert_conn->conn
dereferece.

Signed-off-by: default avatarJenny Derzhavetz <jennyf@mellanox.com>
Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a91eb042

drivers/infiniband/ulp/isert/ib_isert.c

+5 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ isert_put_conn(struct isert_conn *isert_conn) 
 * @isert_conn: isert connection struct

 *

 * Notes:

 * In case the connection state is FULL_FEATURE, move state

 * In case the connection state is BOUND, move state

 * to TEMINATING and start teardown sequence (rdma_disconnect).

 * In case the connection state is UP, complete flush as well.

 *
@@ -836,6 +836,7 @@ isert_conn_terminate(struct isert_conn *isert_conn) 
	case ISER_CONN_TERMINATING:

		break;

	case ISER_CONN_UP:

	case ISER_CONN_BOUND:

	case ISER_CONN_FULL_FEATURE: /* FALLTHRU */

		isert_info("Terminating conn %p state %d\n",

			   isert_conn, isert_conn->state);
@@ -2062,7 +2063,8 @@ isert_cq_comp_err(struct isert_conn *isert_conn, struct ib_wc *wc) 
			isert_completion_put(desc, isert_cmd, ib_dev, true);

	} else {

		isert_conn->post_recv_buf_count--;

		if (!isert_conn->post_recv_buf_count)

		if (!isert_conn->post_recv_buf_count &&

		    isert_conn->state >= ISER_CONN_BOUND)

			iscsit_cause_connection_reinstatement(isert_conn->conn, 0);

	}

}
@@ -3194,6 +3196,7 @@ accept_wait: 


	conn->context = isert_conn;

	isert_conn->conn = conn;

	isert_conn->state = ISER_CONN_BOUND;



	isert_set_conn_info(np, conn, isert_conn);

drivers/infiniband/ulp/isert/ib_isert.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ enum iser_ib_op_code { 
enum iser_conn_state {

	ISER_CONN_INIT,

	ISER_CONN_UP,

	ISER_CONN_BOUND,

	ISER_CONN_FULL_FEATURE,

	ISER_CONN_TERMINATING,

	ISER_CONN_DOWN,