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: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
This commit is contained in:
parent
8a34e2f8ba
commit
425e0f6852
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user