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

Commit 945e5abc authored by Wei Yongjun's avatar Wei Yongjun Committed by Vlad Yasevich
Browse files

sctp: fix the error code when ASCONF is received with invalid address 



Use Unresolvable Address error cause instead of Invalid Mandatory
Parameter error cause when process ASCONF chunk with invalid address
since address parameters are not mandatory in the ASCONF chunk.

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

net/sctp/sm_make_chunk.c

+6 −6
Original line number Diff line number Diff line
@@ -2864,19 +2864,19 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, 
	switch (addr_param->v4.param_hdr.type) {

	case SCTP_PARAM_IPV6_ADDRESS:

		if (!asoc->peer.ipv6_address)

			return SCTP_ERROR_INV_PARAM;

			return SCTP_ERROR_DNS_FAILED;

		break;

	case SCTP_PARAM_IPV4_ADDRESS:

		if (!asoc->peer.ipv4_address)

			return SCTP_ERROR_INV_PARAM;

			return SCTP_ERROR_DNS_FAILED;

		break;

	default:

		return SCTP_ERROR_INV_PARAM;

		return SCTP_ERROR_DNS_FAILED;

	}



	af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type));

	if (unlikely(!af))

		return SCTP_ERROR_INV_PARAM;

		return SCTP_ERROR_DNS_FAILED;



	af->from_addr_param(&addr, addr_param, htons(asoc->peer.port), 0);
@@ -2886,7 +2886,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, 
	 *  make sure we check for that)

	 */

	if (!af->is_any(&addr) && !af->addr_valid(&addr, NULL, asconf->skb))

		return SCTP_ERROR_INV_PARAM;

		return SCTP_ERROR_DNS_FAILED;



	switch (asconf_param->param_hdr.type) {

	case SCTP_PARAM_ADD_IP:
@@ -2954,7 +2954,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, 


		peer = sctp_assoc_lookup_paddr(asoc, &addr);

		if (!peer)

			return SCTP_ERROR_INV_PARAM;

			return SCTP_ERROR_DNS_FAILED;



		sctp_assoc_set_primary(asoc, peer);

		break;