From patchwork Tue Dec 20 05:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 707304 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tjRhx2xPtz9t15 for ; Tue, 20 Dec 2016 16:50:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a1e62WAo"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755676AbcLTFuX (ORCPT ); Tue, 20 Dec 2016 00:50:23 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35405 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbcLTFuP (ORCPT ); Tue, 20 Dec 2016 00:50:15 -0500 Received: by mail-pf0-f193.google.com with SMTP id i88so8377793pfk.2; Mon, 19 Dec 2016 21:50:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=5mbj4DxDbXPGLKLrKYZp6bmcBcjgqwmwCI0t89E/XIE=; b=a1e62WAosWP96mQUT3kgMzPAQDfEXcm4CpD9gGTzvgqNbsEbWy5XPke4BctM465nlb u2/fLOqM4uKEIRi2Bgsa0FhtzAF0RCsauGH7oUyD46swmyCCFiSqvfLhl6aFgG5eugdk OUSLaPQd03uo+Al7tC62iQ3y2KIyDyUQC0jeSoQ9EXPrLboOI3QuvkOLup0Bc/GMokxd t630L8//QHDGoh8nX+npB4Yu1stGw5W5rndj688joVZeUHLX+ur328B2RQNAZP8dnwSP 3rTa6pGW3Flfz1/Fq2Hq9KNxvTdZ9AaA1nBkJ7Isx5eokCrQ691FJAlKHztRpf7L4QbE FudQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=5mbj4DxDbXPGLKLrKYZp6bmcBcjgqwmwCI0t89E/XIE=; b=HNRooo8yhGvtHGTPCT5FKZ8WoZ5846E/olNZbrHa1s3sqF0wMwBz2a89cYI0zITOYV WYwvD7pwiOCjLSRhwp80ifPlDtOKNBzDyjsdoTTCjUcDNK3swBURx63rp5dRRtNaZteC Pc84JQuCy5aKYqD7ENMR8k8Rak/GK53iIL4q57YSF5n94XMzuCIv4mfMGLxnmwiUvs0l vahnJfaJA17l4s3PPi28sOXmOERbyKyYN4EZNu69ZiEJDbm8XStGfL8t8cN6tFyPe/gV lxwYttZttLs7JHqsENR7YZj7FHtKfJAQwU4Una8qG7mH3Z+4cd+eyz/ZM+1YyQgnAhoc j8Tw== X-Gm-Message-State: AKaTC02/yBIBInHWuyJ/W2OmlxrfjTfaevrgJZiRZ5TxUBxkrZbT7TK9xZPxI26j0mJi/A== X-Received: by 10.99.217.81 with SMTP id e17mr33513382pgj.127.1482213014921; Mon, 19 Dec 2016 21:50:14 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id o126sm35614106pga.34.2016.12.19.21.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 21:50:14 -0800 (PST) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCHv2 net 2/2] sctp: not copying duplicate addrs to the assoc's bind address list Date: Tue, 20 Dec 2016 13:49:50 +0800 Message-Id: <5a0037123617b525dfe456db1055770f39fb1193.1482212764.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sctp.local_addr_list is a global address list that is supposed to include all the local addresses. sctp updates this list according to NETDEV_UP/ NETDEV_DOWN notifications. However, if multiple NICs have the same address, the global list would have duplicate addresses. Even if for one NIC, promote secondaries in __inet_del_ifa can also lead to accumulating duplicate addresses. When sctp binds address 'ANY' and creates a connection, it copies all the addresses from global list into asoc's bind addr list, which makes sctp pack the duplicate addresses into INIT/INIT_ACK packets. This patch is to filter the duplicate addresses when copying the addrs from global list in sctp_copy_local_addr_list and unpacking addr_param from cookie in sctp_raw_to_bind_addrs to asoc's bind addr list. Note that we can't filter the duplicate addrs when global address list gets updated, As NETDEV_DOWN event may remove an addr that still exists in another NIC. Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner --- net/sctp/bind_addr.c | 3 +++ net/sctp/protocol.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index 401c607..1ebc184 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c @@ -292,6 +292,8 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, } af->from_addr_param(&addr, rawaddr, htons(port), 0); + if (sctp_bind_addr_state(bp, &addr) != -1) + goto next; retval = sctp_add_bind_addr(bp, &addr, sizeof(addr), SCTP_ADDR_SRC, gfp); if (retval) { @@ -300,6 +302,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, break; } +next: len = ntohs(param->length); addrs_len -= len; raw_addr_list += len; diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index da5d82b..616a942 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -220,6 +220,9 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp, !(copy_flags & SCTP_ADDR6_PEERSUPP))) continue; + if (sctp_bind_addr_state(bp, &addr->a) != -1) + continue; + error = sctp_add_bind_addr(bp, &addr->a, sizeof(addr->a), SCTP_ADDR_SRC, GFP_ATOMIC); if (error)