lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 12/63] sctp: set sin_port for addr param when checking duplicate address
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Xin Long <lucien.xin@gmail.com>


    [ Upstream commit 2e3ce5bc2aa938653c3866aa7f4901a1f199b1c8 ]

    Commit b8607805dd15 ("sctp: not copying duplicate addrs to the assoc's
    bind address list") tried to check for duplicate address before copying
    to asoc's bind_addr list from global addr list.

    But all the addrs' sin_ports in global addr list are 0 while the addrs'
    sin_ports are bp->port in asoc's bind_addr list. It means even if it's
    a duplicate address, af->cmp_addr will still return 0 as the their
    sin_ports are different.

    This patch is to fix it by setting the sin_port for addr param with
    bp->port before comparing the addrs.

    Fixes: b8607805dd15 ("sctp: not copying duplicate addrs to the assoc's bind address list")
    Reported-by: Wei Chen <weichen@redhat.com>
    Signed-off-by: Xin Long <lucien.xin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sctp/protocol.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/net/sctp/protocol.c
    +++ b/net/sctp/protocol.c
    @@ -199,6 +199,7 @@ int sctp_copy_local_addr_list(struct net
    sctp_scope_t scope, gfp_t gfp, int copy_flags)
    {
    struct sctp_sockaddr_entry *addr;
    + union sctp_addr laddr;
    int error = 0;

    rcu_read_lock();
    @@ -220,7 +221,10 @@ int sctp_copy_local_addr_list(struct net
    !(copy_flags & SCTP_ADDR6_PEERSUPP)))
    continue;

    - if (sctp_bind_addr_state(bp, &addr->a) != -1)
    + laddr = addr->a;
    + /* also works for setting ipv6 address port */
    + laddr.v4.sin_port = htons(bp->port);
    + if (sctp_bind_addr_state(bp, &laddr) != -1)
    continue;

    error = sctp_add_bind_addr(bp, &addr->a, sizeof(addr->a),

    \
     
     \ /
      Last update: 2017-03-20 19:15    [W:4.139 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site