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

Commit 0fa6ebc6 authored by Sage Weil's avatar Sage Weil Committed by Alex Elder
Browse files

libceph: fix protocol feature mismatch failure path 



We should not set con->state to CLOSED here; that happens in
ceph_fault() in the caller, where it first asserts that the state
is not yet CLOSED.  Avoids a BUG when the features don't match.

Since the fail_protocol() has become a trivial wrapper, replace
calls to it with direct calls to reset_connection().

Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 122070a2

net/ceph/messenger.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -506,6 +506,7 @@ static void reset_connection(struct ceph_connection *con) 
{

{

	/* reset connection, out_queue, msg_ and connect_seq */

	/* reset connection, out_queue, msg_ and connect_seq */

	/* discard existing out_queue and msg_seq */

	/* discard existing out_queue and msg_seq */

	dout("reset_connection %p\n", con);

	ceph_msg_remove_list(&con->out_queue);

	ceph_msg_remove_list(&con->out_queue);

	ceph_msg_remove_list(&con->out_sent);

	ceph_msg_remove_list(&con->out_sent);
@@ -1506,13 +1507,6 @@ static int process_banner(struct ceph_connection *con) 
	return 0;

	return 0;

}

}





static void fail_protocol(struct ceph_connection *con)

{

	reset_connection(con);

	WARN_ON(con->state != CON_STATE_NEGOTIATING);

	con->state = CON_STATE_CLOSED;

}



static int process_connect(struct ceph_connection *con)

static int process_connect(struct ceph_connection *con)

{

{

	u64 sup_feat = con->msgr->supported_features;

	u64 sup_feat = con->msgr->supported_features;
@@ -1530,7 +1524,7 @@ static int process_connect(struct ceph_connection *con) 
		       ceph_pr_addr(&con->peer_addr.in_addr),

		       ceph_pr_addr(&con->peer_addr.in_addr),

		       sup_feat, server_feat, server_feat & ~sup_feat);

		       sup_feat, server_feat, server_feat & ~sup_feat);

		con->error_msg = "missing required protocol features";

		con->error_msg = "missing required protocol features";

		fail_protocol(con);

		reset_connection(con);

		return -1;

		return -1;





	case CEPH_MSGR_TAG_BADPROTOVER:

	case CEPH_MSGR_TAG_BADPROTOVER:
@@ -1541,7 +1535,7 @@ static int process_connect(struct ceph_connection *con) 
		       le32_to_cpu(con->out_connect.protocol_version),

		       le32_to_cpu(con->out_connect.protocol_version),

		       le32_to_cpu(con->in_reply.protocol_version));

		       le32_to_cpu(con->in_reply.protocol_version));

		con->error_msg = "protocol version mismatch";

		con->error_msg = "protocol version mismatch";

		fail_protocol(con);

		reset_connection(con);

		return -1;

		return -1;





	case CEPH_MSGR_TAG_BADAUTHORIZER:

	case CEPH_MSGR_TAG_BADAUTHORIZER:
@@ -1631,7 +1625,7 @@ static int process_connect(struct ceph_connection *con) 
			       ceph_pr_addr(&con->peer_addr.in_addr),

			       ceph_pr_addr(&con->peer_addr.in_addr),

			       req_feat, server_feat, req_feat & ~server_feat);

			       req_feat, server_feat, req_feat & ~server_feat);

			con->error_msg = "missing required protocol features";

			con->error_msg = "missing required protocol features";

			fail_protocol(con);

			reset_connection(con);

			return -1;

			return -1;

		}

		}