From nobody Mon Mar 2 08:28:35 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0EA1727707; Wed, 11 Feb 2026 19:06:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770836814; cv=none; b=OFFNoCYJdG53sVCLZxQRA6XkIyTW7Z8MVkUi04hy0n2TxAFIh0APpCraNBhBjeYhejEgkSSN3139j7MOsjzjdGeC3G6SdKe7D7C5/SDo1vd0tdxg+XTyKYVyPq0nFozQB3alGrJemb2weV35/0HjdhAcKJwU8y1a6/fSdH75EG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770836814; c=relaxed/simple; bh=yZKbun0UE2n4F4z+yVDxFjjvJUMEnSXooO5JyqQFnHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BvLnAFL4NYmjtwqWfy5Gm8H5SLXas5y9zD0G59YKNhLaQs8esmZeZ3eFOmlm4YS0CLW2jw+5wko5+Jej/SkzFrBTLMn5OFwNOFfwGLiQPsPjGyPCjoU4l7v130tVnGtutwzldyzcq35AElPm9fNj+MK2kfuUIfu9M0gtjle2P9k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rxqhv+1S; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rxqhv+1S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93459C2BC86; Wed, 11 Feb 2026 19:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770836813; bh=yZKbun0UE2n4F4z+yVDxFjjvJUMEnSXooO5JyqQFnHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxqhv+1SVp8XJUtqd9O3hQ/TJ1FQ5T2W2klxOHJDhJbE5hkvte/2rqo0bShCWU4CI 5emqMnPurdRUMGembGhnzMjJlNx8gL/oCtRW91Fy0TdMwzTkghHARn3dUS5j8WHDRf Eov+JeDQMPt6nqZUCx+RVvGfFcLDdr0ExoJlu70Om3/hNs4SpilsDTTig2XiSvqxxj +hXFOj3lS+hmHEuVX5EchAImv1uLeS1LLdcko4tHRC9bCLZMrYU6HkAwNhW2E20JsS Eiw289WcsACuvMM6/nYckTK3gzKgBOSj4q7dEbC6a8nFHo4dc9ztZNnGeU63x2bc2X KsPxb9jqmR4fQ== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org, Mat Martineau , Jakub Kicinski Subject: [PATCH 6.1.y 1/6] selftests: mptcp: pm: ensure unknown flags are ignored Date: Wed, 11 Feb 2026 20:06:19 +0100 Message-ID: <20260211190617.77192-9-matttbe@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260211190617.77192-8-matttbe@kernel.org> References: <20260211190617.77192-8-matttbe@kernel.org> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3623; i=matttbe@kernel.org; h=from:subject; bh=yZKbun0UE2n4F4z+yVDxFjjvJUMEnSXooO5JyqQFnHk=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ7LusEBW0Rv7g/WMKdm3vVIQ8X53hxgzOB6pMcWsVPn 2ETMajsKGVhEONikBVTZJFui8yf+byKt8TLzwJmDisTyBAGLk4BmEhRBCPDoU9/Z9WlaN9fETk9 if3RBu3g8E+/3kj7fs3MC3US3DfFipHhqV/RavN4/6ZJSw/Jz+FRPziz7wTjDQ4B/1bvN6qOhfn cAA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" commit 29f4801e9c8dfd12bdcb33b61a6ac479c7162bd7 upstream. This validates the previous commit: the userspace can set unknown flags -- the 7th bit is currently unused -- without errors, but only the supported ones are printed in the endpoints dumps. The 'Fixes' tag here below is the same as the one from the previous commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID. Fixes: 01cacb00b35c ("mptcp: add netlink-based PM") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20251205-net-mptcp-misc-fixes-6-19-rc1-v1-2-= 9e4781a6c1b8@kernel.org Signed-off-by: Jakub Kicinski [ Conflicts in pm_netlink.sh, because some refactoring have been done later on: commit 0d16ed0c2e74 ("selftests: mptcp: add {get,format}_endpoint(s) helpers") and commit c99d57d0007a ("selftests: mptcp: use pm_nl endpoint ops") are not in this version. The same operation can still be done at the same place, without using the new helpers. Also, commit 1dc88d241f92 ("selftests: mptcp: pm_nl_ctl: always look for errors") is not in this version, and create a conflict in the context which is not related to the modification here. ] Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 4 ++++ tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 1b0ed849c617..4dfb6b93d9cb 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -124,6 +124,10 @@ id 8 flags signal 10.0.1.8" "id limit" ip netns exec $ns1 ./pm_nl_ctl flush check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" =20 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags unknown +check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1" "ignore= unknown flags" +ip netns exec $ns1 ./pm_nl_ctl flush + ip netns exec $ns1 ./pm_nl_ctl limits 9 1 check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs= above hard limit" =20 diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 17e5b7ec53b6..5feecb3463a1 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -29,6 +29,8 @@ #define IPPROTO_MPTCP 262 #endif =20 +#define MPTCP_PM_ADDR_FLAG_UNKNOWN _BITUL(7) + static void syntax(char *argv[]) { fprintf(stderr, "%s add|ann|rem|csf|dsf|get|set|del|flush|dump|events|lis= ten|accept []\n", argv[0]); @@ -814,6 +816,8 @@ int add_addr(int fd, int pm_family, int argc, char *arg= v[]) flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; else if (!strcmp(tok, "fullmesh")) flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + else if (!strcmp(tok, "unknown")) + flags |=3D MPTCP_PM_ADDR_FLAG_UNKNOWN; else error(1, errno, "unknown flag %s", argv[arg]); @@ -1019,6 +1023,13 @@ static void print_addr(struct rtattr *attrs, int len) printf(","); } =20 + if (flags & MPTCP_PM_ADDR_FLAG_UNKNOWN) { + printf("unknown"); + flags &=3D ~MPTCP_PM_ADDR_FLAG_UNKNOWN; + if (flags) + printf(","); + } + /* bump unknown flags, if any */ if (flags) printf("0x%x", flags); --=20 2.51.0