David Can you also queue this one and Patch 2/2 to stable. The problems are there as well. Thanks -vlad Vlad Yasevich wrote: > Do not enable peer features like addip and auth, if they > are administratively disabled localy. If the peer resports > that he supports something that we don't, neither end can > use it so enabling it is pointless. This solves a problem > when talking to a peer that has auth and addip enabled while > we do not. Found by Andrei Pelinescu-Onciul <andrei@xxxxxxxxx>. > > Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx> > --- > net/sctp/sm_make_chunk.c | 9 +++++++-- > 1 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c > index e8ca4e5..fe94f42 100644 > --- a/net/sctp/sm_make_chunk.c > +++ b/net/sctp/sm_make_chunk.c > @@ -1886,11 +1886,13 @@ static void sctp_process_ext_param(struct sctp_association *asoc, > /* if the peer reports AUTH, assume that he > * supports AUTH. > */ > - asoc->peer.auth_capable = 1; > + if (sctp_auth_enable) > + asoc->peer.auth_capable = 1; > break; > case SCTP_CID_ASCONF: > case SCTP_CID_ASCONF_ACK: > - asoc->peer.asconf_capable = 1; > + if (sctp_addip_enable) > + asoc->peer.asconf_capable = 1; > break; > default: > break; > @@ -2460,6 +2462,9 @@ do_addr_param: > break; > > case SCTP_PARAM_SET_PRIMARY: > + if (!sctp_addip_enable) > + goto fall_through; > + > addr_param = param.v + sizeof(sctp_addip_param_t); > > af = sctp_get_af_specific(param_type2af(param.p->type)); -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
