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

Commit 425e0f68 authored by Wei Yongjun's avatar Wei Yongjun Committed by Vlad Yasevich
Browse files

sctp: avoid overwrite the return value of sctp_process_asconf_ack() 



The return value of sctp_process_asconf_ack() may be
overwritten while process parameters with no error.
This patch fixed the problem.

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
parent 8a34e2f8

net/sctp/sm_make_chunk.c

+3 −6
Original line number Diff line number Diff line
@@ -3104,7 +3104,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, 
}



/* Process a asconf parameter that is successfully acked. */

static int sctp_asconf_param_success(struct sctp_association *asoc,

static void sctp_asconf_param_success(struct sctp_association *asoc,

				     sctp_addip_param_t *asconf_param)

{

	struct sctp_af *af;
@@ -3113,7 +3113,6 @@ static int sctp_asconf_param_success(struct sctp_association *asoc, 
	union sctp_addr_param *addr_param;

	struct sctp_transport *transport;

	struct sctp_sockaddr_entry *saddr;

	int retval = 0;



	addr_param = (union sctp_addr_param *)

			((void *)asconf_param + sizeof(sctp_addip_param_t));
@@ -3136,7 +3135,7 @@ static int sctp_asconf_param_success(struct sctp_association *asoc, 
		break;

	case SCTP_PARAM_DEL_IP:

		local_bh_disable();

		retval = sctp_del_bind_addr(bp, &addr);

		sctp_del_bind_addr(bp, &addr);

		local_bh_enable();

		list_for_each_entry(transport, &asoc->peer.transport_addr_list,

				transports) {
@@ -3148,8 +3147,6 @@ static int sctp_asconf_param_success(struct sctp_association *asoc, 
	default:

		break;

	}



	return retval;

}



/* Get the corresponding ASCONF response error code from the ASCONF_ACK chunk
@@ -3266,7 +3263,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, 


		switch (err_code) {

		case SCTP_ERROR_NO_ERROR:

			retval = sctp_asconf_param_success(asoc, asconf_param);

			sctp_asconf_param_success(asoc, asconf_param);

			break;



		case SCTP_ERROR_RSRC_LOW: