sctp: two fixes for spp_ipv6_flowlabel and spp_dscp sockopts
Subsystems (3)
Xin Long
maintainercover sctp: two fixes for spp_ipv6_flowlabel and spp_dscp sockopts
This patchset fixes two problems in sctp_apply_peer_addr_params() when setting spp_ipv6_flowlabel or spp_dscp.
Xin Long (2):
sctp: fix invalid reference to the index variable of the iterator
sctp: not traverse asoc trans list if non-ipv6 trans exists for
ipv6_flowlabel
net/sctp/socket.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 1/2 sctp: fix invalid reference to the index variable of the iterator
Now in sctp_apply_peer_addr_params(), if SPP_IPV6_FLOWLABEL flag is set and trans is NULL, it would use trans as the index variable to traverse transport_addr_list, then trans is set as the last transport of it.
Later, if SPP_DSCP flag is set, it would enter into the wrong branch as trans is actually an invalid reference.
So fix it by using a new index variable to traverse transport_addr_list for both SPP_DSCP and SPP_IPV6_FLOWLABEL flags process.
--- net/sctp/socket.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
net/sctp/socket.c +13 -11
@@ -2663,14 +2663,15 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,SCTP_FLOWLABEL_VAL_MASK ; trans->flowlabel |=SCTP_FLOWLABEL_SET_MASK ; }else if (asoc) { -list_for_each_entry (trans, - &asoc->peer.transport_addr_list, +struct sctp_transport *t; + +list_for_each_entry (t, &asoc->peer.transport_addr_list, transports) { -if (trans->ipaddr.sa.sa_family !=AF_INET6 ) +if (t->ipaddr.sa.sa_family !=AF_INET6 )continue ; - trans->flowlabel = params->spp_ipv6_flowlabel & -SCTP_FLOWLABEL_VAL_MASK ; - trans->flowlabel |=SCTP_FLOWLABEL_SET_MASK ; + t->flowlabel = params->spp_ipv6_flowlabel & +SCTP_FLOWLABEL_VAL_MASK ; + t->flowlabel |=SCTP_FLOWLABEL_SET_MASK ; } asoc->flowlabel = params->spp_ipv6_flowlabel &SCTP_FLOWLABEL_VAL_MASK ;
@@ -2687,12 +2688,13 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, trans->dscp = params->spp_dscp &SCTP_DSCP_VAL_MASK ; trans->dscp |=SCTP_DSCP_SET_MASK ; }else if (asoc) { -list_for_each_entry (trans, - &asoc->peer.transport_addr_list, +struct sctp_transport *t; + +list_for_each_entry (t, &asoc->peer.transport_addr_list, transports) { - trans->dscp = params->spp_dscp & -SCTP_DSCP_VAL_MASK ; - trans->dscp |=SCTP_DSCP_SET_MASK ; + t->dscp = params->spp_dscp & +SCTP_DSCP_VAL_MASK ; + t->dscp |=SCTP_DSCP_SET_MASK ; } asoc->dscp = params->spp_dscp &SCTP_DSCP_VAL_MASK ; asoc->dscp |=SCTP_DSCP_SET_MASK ;
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 2/2 sctp: not traverse asoc trans list if non-ipv6 trans exists for ipv6_flowlabel
When users set params.spp_address and get a trans, ipv6_flowlabel flag should be applied into this trans. But even if this one is not an ipv6 trans, it should not go to apply it into all other transes of the asoc but simply ignore it.
--- net/sctp/socket.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/sctp/socket.c +6 -4
@@ -2658,10 +2658,12 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, }if (params->spp_flags &SPP_IPV6_FLOWLABEL ) { -if (trans && trans->ipaddr.sa.sa_family =AF_INET6 ) { - trans->flowlabel = params->spp_ipv6_flowlabel & -SCTP_FLOWLABEL_VAL_MASK ; - trans->flowlabel |=SCTP_FLOWLABEL_SET_MASK ; +if (trans) { +if (trans->ipaddr.sa.sa_family =AF_INET6 ) { + trans->flowlabel = params->spp_ipv6_flowlabel & +SCTP_FLOWLABEL_VAL_MASK ; + trans->flowlabel |=SCTP_FLOWLABEL_SET_MASK ; + } }else if (asoc) {struct sctp_transport *t;
Signature · 1 line
2.1.0
Quoted 10 lines · Xin Long
This patchset fixes two problems in
sctp_apply_peer_addr_params()when settingspp_ipv6_flowlabelorspp_dscp.Xin Long (2):
sctp: fix invalid reference to the index variable of the iterator
sctp: not traverse asoc trans list if non-ipv6 trans exists for
ipv6_flowlabelnet/sctp/socket.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
Series
David Miller
maintainerFrom: Marcelo Ricardo Leitner <[email protected]>
Date: Mon, 3 Sep 2018 19:06:06 -0300
Quoted 9 lines · Xin Long
Quoted 8 lines
This patchset fixes two problems in
sctp_apply_peer_addr_params()when settingspp_ipv6_flowlabelorspp_dscp.Xin Long (2):
sctp: fix invalid reference to the index variable of the iterator
sctp: not traverse asoc trans list if non-ipv6 trans exists for
ipv6_flowlabel
Quoted 5 lines
Quoted 2 lines
net/sctp/socket.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)Series
Series applied.