| Message ID | 1382459696-1732-1-git-send-email-dborkman@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Oct 22, 2013, at 6:34 PM, Daniel Borkmann wrote: > Commit 8a07eb0a50 ("sctp: Add ASCONF operation on the single-homed host") > implemented possible use of IPv4 addresses with non SCTP_ADDR_SRC state > as source address when sending ASCONF (ADD) packets, but IPv6 part for > that was not implemented in 8a07eb0a50. Therefore, as this is not restricted > to IPv4-only, fix this up to allow the same for IPv6 addresses in SCTP. > > Signed-off-by: Daniel Borkmann <dborkman@redhat.com> > Cc: Michio Honda <micchie@sfc.wide.ad.jp> > --- > net/sctp/ipv6.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c > index e7b2d4f..96a5591 100644 > --- a/net/sctp/ipv6.c > +++ b/net/sctp/ipv6.c > @@ -279,7 +279,9 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, > sctp_v6_to_addr(&dst_saddr, &fl6->saddr, htons(bp->port)); > rcu_read_lock(); > list_for_each_entry_rcu(laddr, &bp->address_list, list) { > - if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC)) > + if (!laddr->valid || laddr->state == SCTP_ADDR_DEL || > + (laddr->state != SCTP_ADDR_SRC && > + !asoc->src_out_of_asoc_ok)) > continue; > > /* Do not compare against v4 addrs */ > -- > 1.8.3.1 Acked-by: Michio Honda <micchie@sfc.wide.ad.jp> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 22, 2013 at 12:34 PM, Daniel Borkmann <dborkman@redhat.com> wrote: > > Commit 8a07eb0a50 ("sctp: Add ASCONF operation on the single-homed host") > implemented possible use of IPv4 addresses with non SCTP_ADDR_SRC state > as source address when sending ASCONF (ADD) packets, but IPv6 part for > that was not implemented in 8a07eb0a50. Therefore, as this is not restricted > to IPv4-only, fix this up to allow the same for IPv6 addresses in SCTP. > > Signed-off-by: Daniel Borkmann <dborkman@redhat.com> > Cc: Michio Honda <micchie@sfc.wide.ad.jp> [stupid gmail] Acked-by: Vlad Yasevich <vyasevich@gmail.com> > --- > net/sctp/ipv6.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c > index e7b2d4f..96a5591 100644 > --- a/net/sctp/ipv6.c > +++ b/net/sctp/ipv6.c > @@ -279,7 +279,9 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, > sctp_v6_to_addr(&dst_saddr, &fl6->saddr, htons(bp->port)); > rcu_read_lock(); > list_for_each_entry_rcu(laddr, &bp->address_list, list) { > - if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC)) > + if (!laddr->valid || laddr->state == SCTP_ADDR_DEL || > + (laddr->state != SCTP_ADDR_SRC && > + !asoc->src_out_of_asoc_ok)) > continue; > > /* Do not compare against v4 addrs */ > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 22, 2013 at 06:34:56PM +0200, Daniel Borkmann wrote: > Commit 8a07eb0a50 ("sctp: Add ASCONF operation on the single-homed host") > implemented possible use of IPv4 addresses with non SCTP_ADDR_SRC state > as source address when sending ASCONF (ADD) packets, but IPv6 part for > that was not implemented in 8a07eb0a50. Therefore, as this is not restricted > to IPv4-only, fix this up to allow the same for IPv6 addresses in SCTP. > > Signed-off-by: Daniel Borkmann <dborkman@redhat.com> > Cc: Michio Honda <micchie@sfc.wide.ad.jp> > --- > net/sctp/ipv6.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c > index e7b2d4f..96a5591 100644 > --- a/net/sctp/ipv6.c > +++ b/net/sctp/ipv6.c > @@ -279,7 +279,9 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, > sctp_v6_to_addr(&dst_saddr, &fl6->saddr, htons(bp->port)); > rcu_read_lock(); > list_for_each_entry_rcu(laddr, &bp->address_list, list) { > - if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC)) > + if (!laddr->valid || laddr->state == SCTP_ADDR_DEL || > + (laddr->state != SCTP_ADDR_SRC && > + !asoc->src_out_of_asoc_ok)) > continue; > > /* Do not compare against v4 addrs */ > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sctp" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Daniel Borkmann <dborkman@redhat.com> Date: Tue, 22 Oct 2013 18:34:56 +0200 > Commit 8a07eb0a50 ("sctp: Add ASCONF operation on the single-homed host") > implemented possible use of IPv4 addresses with non SCTP_ADDR_SRC state > as source address when sending ASCONF (ADD) packets, but IPv6 part for > that was not implemented in 8a07eb0a50. Therefore, as this is not restricted > to IPv4-only, fix this up to allow the same for IPv6 addresses in SCTP. > > Signed-off-by: Daniel Borkmann <dborkman@redhat.com> > Cc: Michio Honda <micchie@sfc.wide.ad.jp> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index e7b2d4f..96a5591 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -279,7 +279,9 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, sctp_v6_to_addr(&dst_saddr, &fl6->saddr, htons(bp->port)); rcu_read_lock(); list_for_each_entry_rcu(laddr, &bp->address_list, list) { - if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC)) + if (!laddr->valid || laddr->state == SCTP_ADDR_DEL || + (laddr->state != SCTP_ADDR_SRC && + !asoc->src_out_of_asoc_ok)) continue; /* Do not compare against v4 addrs */
Commit 8a07eb0a50 ("sctp: Add ASCONF operation on the single-homed host") implemented possible use of IPv4 addresses with non SCTP_ADDR_SRC state as source address when sending ASCONF (ADD) packets, but IPv6 part for that was not implemented in 8a07eb0a50. Therefore, as this is not restricted to IPv4-only, fix this up to allow the same for IPv6 addresses in SCTP. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Cc: Michio Honda <micchie@sfc.wide.ad.jp> --- net/sctp/ipv6.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)