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

Commit 81845c21 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

[SCTP]: correct the number of INIT retransmissions 



We currently count the initial INIT/COOKIE_ECHO chunk toward the
retransmit count and thus sends a total of sctp_max_retrans_init chunks.
The correct behavior is to retransmit the chunk sctp_max_retrans_init in
addition to sending the original.

Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarSridhar Samudrala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7add2a43

net/sctp/sm_statefuns.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2122,7 +2122,7 @@ static sctp_disposition_t sctp_sf_do_5_2_6_stale(const struct sctp_endpoint *ep, 
	struct sctp_bind_addr *bp;

	struct sctp_bind_addr *bp;

	int attempts = asoc->init_err_counter + 1;

	int attempts = asoc->init_err_counter + 1;





	if (attempts >= asoc->max_init_attempts) {

	if (attempts > asoc->max_init_attempts) {

		sctp_add_cmd_sf(commands, SCTP_CMD_INIT_FAILED,

		sctp_add_cmd_sf(commands, SCTP_CMD_INIT_FAILED,

				SCTP_U32(SCTP_ERROR_STALE_COOKIE));

				SCTP_U32(SCTP_ERROR_STALE_COOKIE));

		return SCTP_DISPOSITION_DELETE_TCB;

		return SCTP_DISPOSITION_DELETE_TCB;
@@ -4640,7 +4640,7 @@ sctp_disposition_t sctp_sf_t1_init_timer_expire(const struct sctp_endpoint *ep, 




	SCTP_DEBUG_PRINTK("Timer T1 expired (INIT).\n");

	SCTP_DEBUG_PRINTK("Timer T1 expired (INIT).\n");





	if (attempts < asoc->max_init_attempts) {

	if (attempts <= asoc->max_init_attempts) {

		bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;

		bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;

		repl = sctp_make_init(asoc, bp, GFP_ATOMIC, 0);

		repl = sctp_make_init(asoc, bp, GFP_ATOMIC, 0);

		if (!repl)

		if (!repl)
@@ -4697,7 +4697,7 @@ sctp_disposition_t sctp_sf_t1_cookie_timer_expire(const struct sctp_endpoint *ep 




	SCTP_DEBUG_PRINTK("Timer T1 expired (COOKIE-ECHO).\n");

	SCTP_DEBUG_PRINTK("Timer T1 expired (COOKIE-ECHO).\n");





	if (attempts < asoc->max_init_attempts) {

	if (attempts <= asoc->max_init_attempts) {

		repl = sctp_make_cookie_echo(asoc, NULL);

		repl = sctp_make_cookie_echo(asoc, NULL);

		if (!repl)

		if (!repl)

			return SCTP_DISPOSITION_NOMEM;

			return SCTP_DISPOSITION_NOMEM;

net/sctp/socket.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5426,7 +5426,7 @@ static int sctp_wait_for_connect(struct sctp_association *asoc, long *timeo_p) 
	return err;

	return err;





do_error:

do_error:

	if (asoc->init_err_counter + 1 >= asoc->max_init_attempts)

	if (asoc->init_err_counter + 1 > asoc->max_init_attempts)

		err = -ETIMEDOUT;

		err = -ETIMEDOUT;

	else

	else

		err = -ECONNREFUSED;

		err = -ECONNREFUSED;