From nobody Mon Feb 9 19:25:43 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp3841467uad; Tue, 5 Jul 2022 14:32:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sRAoqwxq8WnJLGz7YcO+q7hBIBAUFQfAVdBzsn/OkEKqVI/vLLI2t8l3c6J/hN6rBeXhHk X-Received: by 2002:a05:6870:9590:b0:de:27ca:c60c with SMTP id k16-20020a056870959000b000de27cac60cmr23232305oao.108.1657056755705; Tue, 05 Jul 2022 14:32:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657056755; cv=none; d=google.com; s=arc-20160816; b=FxT/Gu2DCoawsHSz6BIWJkTfkoG/Y655qMJyYbOo2DG9n0DPQ5XtZ8BcvzeyKNiXnb a1TDUedGcW9aKn3tkzLN/ObfkeUa6Ne+33rSZYblBbQi8HjVV8HGWJ+vSwz9PkV5JEoZ Lf2FmgnT43ddXfnjuGGbHPNbrunQSZwOddo9M23ydEzSthSTMlYe4a5s6Rn2Gkak25KN 7RKzpPOAWH0qaU4jTdSkM2zplkqnEdpwMYHTmiizSCLEH/YEJDajkz8XcxkAeG5o0kO5 Dk6nbxgYmWH0Y3QPuyAegMvDeQhRHbyoYKBcURcgUCxOUaVQTpV/+cDUW0K1H51kQUbv dLCQ== 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:cc:to:from:dkim-signature; bh=7ruvxlvpg3FNXtgmABk+2Cg8/nd7Jq4eWSe5iohX1kE=; b=zZtHu+xKDSw7AvJw9TNa+FpEhO03dw3Aho0vQ4R2Zae/mea4JfBXBVU+60l5qFqqcw gKiaek5kjkcMQxGEpxDHDZyoRft/O499O4kv9AJVps8D6KJCPhD5SjC/5TT4N8bXGVYM jVYh/qpf+LWAeh4J9wija76EP/RXgXFHJUNfa+yAKJTaC6YJttj5iqFAjQDHqIQHrNl3 iPx43Sbcsu7Ts67bNgyO0+02avKeDmtJw0BSDC0tkRVVCwygkXKK/M/IO7Q6VJv0+fNh 2+euY304fkunhSHuoHYYNwG/RXMEQ6LNgLCmi0AngHPazChdaMXzpLnxk9DP+n2D5fcn Pjag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="A8ngY8Q/"; spf=pass (google.com: domain of mptcp+bounces-5961-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5961-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 20-20020aca2114000000b003251b6dda65si35825659oiz.245.2022.07.05.14.32.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2022 14:32:35 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5961-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=@intel.com header.s=Intel header.b="A8ngY8Q/"; spf=pass (google.com: domain of mptcp+bounces-5961-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5961-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 42B78280A7C for ; Tue, 5 Jul 2022 21:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 020076028; Tue, 5 Jul 2022 21:32:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 B08456027 for ; Tue, 5 Jul 2022 21:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657056746; x=1688592746; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PvAHdbWFjgKWzYWOfNz6TaMgTJhXnLK0rBu1llcVCjw=; b=A8ngY8Q/RBfbv6QdT1cZPR11uwaIDDHZA4L7EZ0Ii1Y+v2uGx1+QX+eq DpVILmr8ac9n1wXWl9avh84uLUthdZICBP9mDUvdBK2wjjt3fVCKIfZaP lMIEgVhw630BP4GP24j3UunzdlQkFyS16gx6nw1MqH8IPujA2OJmnk8Oo YsiBKqU84H1g0V3umScagJ59XNH+BvmkTZoasFy66ue75q/B8RN3mI/rd aAIEYIw+tO0xZLx7B0aCVLix1pD4mvNT+JAZ3I/YK53d8V3YnLUc+KFCk hRPaUFa4yms6S/UN392MZTv237lu8kBrIYOFWF/zpRjE8+0QyaBKKqVZO Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="284633940" X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="284633940" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 14:32:23 -0700 X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="590558752" Received: from rcenter-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.17.169]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 14:32:22 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 6/7] mptcp: fix local endpoint accounting Date: Tue, 5 Jul 2022 14:32:16 -0700 Message-Id: <20220705213217.146898-7-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220705213217.146898-1-mathew.j.martineau@linux.intel.com> References: <20220705213217.146898-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni In mptcp_pm_nl_rm_addr_or_subflow() we always mark as available the id corresponding to the just removed address. The used bitmap actually tracks only the local IDs: we must restrict the operation when a (local) subflow is removed. Fixes: a88c9e496937 ("mptcp: do not block subflows creation on errors") Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 2da251dd7c00..7c7395b58944 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -807,7 +807,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp= _sock *msk, removed =3D true; __MPTCP_INC_STATS(sock_net(sk), rm_type); } - __set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap); + if (rm_type =3D=3D MPTCP_MIB_RMSUBFLOW) + __set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap); if (!removed) continue; =20 --=20 2.37.0