From nobody Sun Feb 8 19:03:12 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp951064uad; Fri, 1 Jul 2022 03:05:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1saQtZwqi9VT4r22xR1QCJlQqC9ShR7NpoAVOWWvWGStwT5TZPPOROfBvoOEYfeNwg7wc2I X-Received: by 2002:a63:6888:0:b0:3fe:49fc:3be3 with SMTP id d130-20020a636888000000b003fe49fc3be3mr11342843pgc.182.1656669947663; Fri, 01 Jul 2022 03:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656669947; cv=none; d=google.com; s=arc-20160816; b=w6nVFED6Y0n4UKFwjlmduEygARgLN2KQbI8zKu3uvP//OxalH+NpqgnF2N4SvZap+g bBkvKysEIhn6kNDR6dMdYmM87+oGZSDk2wwIJi94xhMaOcWDvDdgrVDUAkpc8WPONO/i Zrh8AuAcfioYK/UdHe6BU/8qFhIRsRBaiMvTCPHlmUTOak/HR4uP1Efrc4jC1d8Pm39b vyj+FDRpsEYhQ9FaIGpy+1d5N5KZym569uElYZaWbfPdK/95X0CwOjWBmd5uc7PHAC/Y kY7qCedGMeXebG6VVxjilVDP2lAU8xmqzITYrk9IeQZeBmyjjzPdIyKvcYIopLl+gPXt KyIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=xzXC6+q0xBZj4f+7N9q0nm16YAyDGWcwUnsmOjuFUQc=; b=xdvNJF9o/2VtCzhSkEULGa2Rah6KOGSixFE6IAC82VMzQU7Yo5ND+cjDlwKWW848Iz zLGBGtQVe7BmjBfhO3qiJsXBX2UXQ7PSVn7/Zao/pjaeOqCjA2Rfkw/Jm4JA9bFcXmGT A2CojAH05xtXIVCyeHlRij2Q4BpzTHQJrdLphixMnQBL77RB6GYTGnEgC4ugY9bC5dzY dl/ng2M5bwiRRnFO0Qk5zoUzqVkaWnkc/u9h7gkoeOkkZejdxGdVO4/7ZrJbOF8kdxW1 wJscUSH2+zOghDqTQXOmvq/JwvsshaVyv/oBcHM4aua9PTFHjZQgB08+7IOJEg5/OG5B jR3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VW4B+6dh; spf=pass (google.com: domain of mptcp+bounces-5928-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5928-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id f18-20020a63de12000000b003fe34775ab6si29332814pgg.286.2022.07.01.03.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2022 03:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5928-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VW4B+6dh; spf=pass (google.com: domain of mptcp+bounces-5928-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5928-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 48890280CC5 for ; Fri, 1 Jul 2022 10:05:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB48B1855; Fri, 1 Jul 2022 10:05:44 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA6BF1869 for ; Fri, 1 Jul 2022 10:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656669942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xzXC6+q0xBZj4f+7N9q0nm16YAyDGWcwUnsmOjuFUQc=; b=VW4B+6dhxqPmu9/a9uGTkCxQuw+vsJC4VubDpJyh+Gl/i+PbmH1BANSJmq+7N6w7t6U+vt TQaiw2GCcl3Q034xQUk7iyzBqdoBDvMOWLE9TKMEC+ny8F9ouTw1G//jcF7Pq+q9WuvHC/ DhylJj92AjfNpD69g27rHSCXaJUgm1g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-202-jHb127gFPF-7L_DK-aqpgw-1; Fri, 01 Jul 2022 06:05:41 -0400 X-MC-Unique: jHb127gFPF-7L_DK-aqpgw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 504EF802D1C for ; Fri, 1 Jul 2022 10:05:41 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id D40A7400DFD0 for ; Fri, 1 Jul 2022 10:05:40 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 3/6] mptcp: address lookup improvements Date: Fri, 1 Jul 2022 12:05:23 +0200 Message-Id: <6439c41c08c91be16239b686ddb6ea3f2c871d16.1656669391.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" When looking-up a socket address in the endpoint list, we must prefer port-based matches over address only match. Ensure that port-based endpoints are listed first, using head insertion for them. Additionally be sure that only port-based endpoints carry a non zero port number. Signed-off-by: Paolo Abeni --- net/mptcp/pm_netlink.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 8dc7ff9953b9..d6180b34a2c9 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -413,7 +413,7 @@ static bool lookup_address_in_vec(const struct mptcp_ad= dr_info *addrs, unsigned int i; =20 for (i =3D 0; i < nr; i++) { - if (mptcp_addresses_equal(&addrs[i], addr, addr->port)) + if (addrs[i].id =3D=3D addr->id) return true; } =20 @@ -449,7 +449,8 @@ static unsigned int fill_remote_addresses_vec(struct mp= tcp_sock *msk, bool fullm mptcp_for_each_subflow(msk, subflow) { ssk =3D mptcp_subflow_tcp_sock(subflow); remote_address((struct sock_common *)ssk, &addrs[i]); - if (deny_id0 && mptcp_addresses_equal(&addrs[i], &remote, false)) + addrs[i].id =3D subflow->remote_id; + if (deny_id0 && !addrs[i].id) continue; =20 if (!lookup_address_in_vec(addrs, i, &addrs[i]) && @@ -912,10 +913,11 @@ static int mptcp_pm_nl_append_new_local_addr(struct p= m_nl_pernet *pernet, /* do not insert duplicate address, differentiate on port only * singled addresses */ + if (!address_use_port(entry)) + entry->addr.port =3D 0; list_for_each_entry(cur, &pernet->local_addr_list, list) { if (mptcp_addresses_equal(&cur->addr, &entry->addr, - address_use_port(entry) && - address_use_port(cur))) { + cur->addr.port || entry->addr.port)) { /* allow replacing the exiting endpoint only if such * endpoint is an implicit one and the user-space * did not provide an endpoint id @@ -961,7 +963,10 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm= _nl_pernet *pernet, } =20 pernet->addrs++; - list_add_tail_rcu(&entry->list, &pernet->local_addr_list); + if (!entry->addr.port) + list_add_tail_rcu(&entry->list, &pernet->local_addr_list); + else + list_add_rcu(&entry->list, &pernet->local_addr_list); ret =3D entry->addr.id; =20 out: --=20 2.35.3