From nobody Mon Mar 2 06:35:31 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 EB2482FE579; Thu, 12 Feb 2026 11:51:05 +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=1770897066; cv=none; b=tnM7znYteFrXyaQ4S4nJy/2RMEB10xjg3OjkKktvmpAbKuBYzKy++seN698Rumn8OpoEwCrdDNVfIBzgrWaRDwvMaAXMSOllhonSn1xdBgee224kbeJyOzHvNVZjticw2ho7CoJsmM5NCkQkrl4GfpYcYBNiGHJ4TXlm241fMNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770897066; c=relaxed/simple; bh=WmbzLKDB0Uaqeg3tAn1+tey25NxlODgd+5JE8M2pG88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LbFMEIEaHUc1f+G+6DbdLh67Uc5DDigpdyD/a4xtffEHhtmDwitlb9uTRDdGHQ0kcKFf1E4bHsei3g0iOFre9RBWkeo9gC3RUTO5NbOVfPYr9UFROxqzMBWa07KcSMepoVzanvmrg+B3ekTnVYZtAWVGprvw/4JpiLoAIqy7u7I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u57jX9Km; 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="u57jX9Km" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24A76C4CEF7; Thu, 12 Feb 2026 11:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770897065; bh=WmbzLKDB0Uaqeg3tAn1+tey25NxlODgd+5JE8M2pG88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u57jX9Km3ju/LH5+ytVyhvQI7LBpNCKNjSu0bNZicWxQGrCsqvWMJgTtNG8qHZQc8 F4gyV6SkzMrxOrwOaVq+MdXupEwq7hBD7RAdYBCvgMogXywJELcqDrMPXzcZNJCF3A LSxd/ZXa0aW0W+acrNEvleYAHC8Aqv0jzFy3bFJvetotbMpHa5zZpGeCaI5gStW3Sv /a/KD/9pC/mjS0YemjqzLlCmd+WzDaxVZ2CT6ZmULkqb92yrMIsS68mY8L/x+RhY/b 9qsb2n+PWf18h11G6CbU3xTQfajQ2v+wtDcur05YHqUhcJZRIovfN6vE7TxiQZNfD1 ob/6/tDBmAgdg== From: "Matthieu Baerts (NGI0)" To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski Subject: [PATCH 5.10.y] selftests: mptcp: pm: ensure unknown flags are ignored Date: Thu, 12 Feb 2026 12:50:57 +0100 Message-ID: <20260212115056.898313-2-matttbe@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025122947-clapping-zookeeper-5d32@gregkh> References: <2025122947-clapping-zookeeper-5d32@gregkh> 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=3927; i=matttbe@kernel.org; h=from:subject; bh=WmbzLKDB0Uaqeg3tAn1+tey25NxlODgd+5JE8M2pG88=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ79y18opx92rg+kGnPjfLyFRdsnnU5/fF+cWlXRu/6o DOnv++a31HKwiDGxSArpsgi3RaZP/N5FW+Jl58FzBxWJpAhDFycAjCRcyGMDDceskVdfbDNO/zy aV/L21PtpxuezHkt/dJlo+RrllPRUy0YGX6ZeJ4NPaUR1VrKrq2wQb334qNg/6Tt59V/m2QuKdM 1ZQEA 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. In v5.10, endpoints couldn't be re-used directly, so the flag is tested before. Conflicts in pm_nl_ctl.c, because commit 69c6ce7b6eca ("selftests: mptcp: add implicit endpoint test case") and commit 371b90377e60 ("selftests: mptcp: set and print the fullmesh flag") are not in this version, and caused 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 | 2 +- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 7d194f5c2939..9d95d7e5b70a 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -80,7 +80,7 @@ if mptcp_lib_expect_all_features; then subflows 0" "defaults limits" fi =20 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags unknown ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 flags signal,backup check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1" "simpl= e add/get addr" diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index b24a2f17d415..c6d7e0f2a8b8 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -22,6 +22,8 @@ #define MPTCP_PM_NAME "mptcp_pm" #endif =20 +#define MPTCP_PM_ADDR_FLAG_UNKNOWN _BITUL(7) + static void syntax(char *argv[]) { fprintf(stderr, "%s add|get|del|flush|dump|accept []\n", argv[0]); @@ -236,6 +238,8 @@ int add_addr(int fd, int pm_family, int argc, char *arg= v[]) flags |=3D MPTCP_PM_ADDR_FLAG_SIGNAL; else if (!strcmp(tok, "backup")) flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; + else if (!strcmp(tok, "unknown")) + flags |=3D MPTCP_PM_ADDR_FLAG_UNKNOWN; else error(1, errno, "unknown flag %s", argv[arg]); @@ -373,6 +377,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