diff for duplicates of <20241118182718.3011097-12-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 094d9c4..5b0b2fc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,46 +1,69 @@ -From: Geliang Tang <tanggeliang@kylinos.cn> +[ Sasha's backport helper bot ] -commit f642c5c4d528d11bd78b6c6f84f541cd3c0bea86 upstream. +Hi, -When traversing userspace_pm_local_addr_list and deleting an entry from -it in mptcp_pm_nl_remove_doit(), msk->pm.lock should be held. +The upstream commit SHA1 provided is correct: f642c5c4d528d11bd78b6c6f84f541cd3c0bea86 -This patch holds this lock before mptcp_userspace_pm_lookup_addr_by_id() -and releases it after list_move() in mptcp_pm_nl_remove_doit(). +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Geliang Tang <tanggeliang@kylinos.cn> -Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") -Cc: stable@vger.kernel.org -Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> -Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-2-b835580cefa8@kernel.org -Signed-off-by: Jakub Kicinski <kuba@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (different SHA1: ff6abb7bc44a) | +| 6.6.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - net/mptcp/pm_userspace.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c -index e268f61d8eb0..8faf776cb977 100644 ---- a/net/mptcp/pm_userspace.c -+++ b/net/mptcp/pm_userspace.c -@@ -324,14 +324,17 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - - lock_sock(sk); - -+ spin_lock_bh(&msk->pm.lock); - match = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val); - if (!match) { - GENL_SET_ERR_MSG(info, "address with specified id not found"); -+ spin_unlock_bh(&msk->pm.lock); - release_sock(sk); - goto remove_err; - } +--- - 2024-11-19 01:13:28.589534977 -0500 ++++ /tmp/tmp.4bH6oETSx7 2024-11-19 01:13:28.583100037 -0500 +@@ -1,3 +1,5 @@ ++commit f642c5c4d528d11bd78b6c6f84f541cd3c0bea86 upstream. ++ + When traversing userspace_pm_local_addr_list and deleting an entry from + it in mptcp_pm_nl_remove_doit(), msk->pm.lock should be held. - list_move(&match->list, &free_list); -+ spin_unlock_bh(&msk->pm.lock); +@@ -11,15 +13,16 @@ + Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-2-b835580cefa8@kernel.org + Signed-off-by: Jakub Kicinski <kuba@kernel.org> ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/pm_userspace.c | 3 +++ + 1 file changed, 3 insertions(+) - mptcp_pm_remove_addrs(msk, &free_list); - --- -2.45.2 + diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c +-index 3f888bfe1462e..e35178f5205fa 100644 ++index e268f61d8eb0..8faf776cb977 100644 + --- a/net/mptcp/pm_userspace.c + +++ b/net/mptcp/pm_userspace.c +-@@ -308,14 +308,17 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -324,14 +324,17 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + + lock_sock(sk); + +@@ -29,7 +32,7 @@ + GENL_SET_ERR_MSG(info, "address with specified id not found"); + + spin_unlock_bh(&msk->pm.lock); + release_sock(sk); +- goto out; ++ goto remove_err; + } + + list_move(&match->list, &free_list); +@@ -37,3 +40,6 @@ + + mptcp_pm_remove_addrs(msk, &free_list); + ++-- ++2.45.2 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.6.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index c530491..b04b6ee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,61 +1,79 @@ - "ref\020241118182718.3011097-8-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.6.y 4/6] mptcp: hold pm lock when deleting entry\0" - "Date\0Mon, 18 Nov 2024 19:27:22 +0100\0" - "To\0mptcp@lists.linux.dev" - stable@vger.kernel.org - " gregkh@linuxfoundation.org\0" - "Cc\0Geliang Tang <tanggeliang@kylinos.cn>" - sashal@kernel.org - Matthieu Baerts <matttbe@kernel.org> - " Jakub Kicinski <kuba@kernel.org>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.6.y 4/6] mptcp: hold pm lock when deleting entry\0" + "Date\0Tue, 19 Nov 2024 07:30:37 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0Matthieu Baerts (NGI0) <matttbe@kernel.org>" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Geliang Tang <tanggeliang@kylinos.cn>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "commit f642c5c4d528d11bd78b6c6f84f541cd3c0bea86 upstream.\n" + "Hi,\n" "\n" - "When traversing userspace_pm_local_addr_list and deleting an entry from\n" - "it in mptcp_pm_nl_remove_doit(), msk->pm.lock should be held.\n" + "The upstream commit SHA1 provided is correct: f642c5c4d528d11bd78b6c6f84f541cd3c0bea86\n" "\n" - "This patch holds this lock before mptcp_userspace_pm_lookup_addr_by_id()\n" - "and releases it after list_move() in mptcp_pm_nl_remove_doit().\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: \"Matthieu Baerts (NGI0)\" <matttbe@kernel.org>\n" + "Commit author: Geliang Tang <tanggeliang@kylinos.cn>\n" "\n" - "Fixes: d9a4594edabf (\"mptcp: netlink: Add MPTCP_PM_CMD_REMOVE\")\n" - "Cc: stable@vger.kernel.org\n" - "Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>\n" - "Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-2-b835580cefa8@kernel.org\n" - "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (different SHA1: ff6abb7bc44a) |\n" + "| 6.6.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " net/mptcp/pm_userspace.c | 3 +++\n" - " 1 file changed, 3 insertions(+)\n" - "\n" - "diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" - "index e268f61d8eb0..8faf776cb977 100644\n" - "--- a/net/mptcp/pm_userspace.c\n" - "+++ b/net/mptcp/pm_userspace.c\n" - "@@ -324,14 +324,17 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \n" - " \tlock_sock(sk);\n" - " \n" - "+\tspin_lock_bh(&msk->pm.lock);\n" - " \tmatch = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val);\n" - " \tif (!match) {\n" - " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" - "+\t\tspin_unlock_bh(&msk->pm.lock);\n" - " \t\trelease_sock(sk);\n" - " \t\tgoto remove_err;\n" - " \t}\n" + "--- -\t2024-11-19 01:13:28.589534977 -0500\n" + "+++ /tmp/tmp.4bH6oETSx7\t2024-11-19 01:13:28.583100037 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+commit f642c5c4d528d11bd78b6c6f84f541cd3c0bea86 upstream.\n" + "+\n" + " When traversing userspace_pm_local_addr_list and deleting an entry from\n" + " it in mptcp_pm_nl_remove_doit(), msk->pm.lock should be held.\n" " \n" - " \tlist_move(&match->list, &free_list);\n" - "+\tspin_unlock_bh(&msk->pm.lock);\n" + "@@ -11,15 +13,16 @@\n" + " Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-2-b835580cefa8@kernel.org\n" + " Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/pm_userspace.c | 3 +++\n" + " 1 file changed, 3 insertions(+)\n" " \n" - " \tmptcp_pm_remove_addrs(msk, &free_list);\n" - " \n" - "-- \n" - 2.45.2 + " diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" + "-index 3f888bfe1462e..e35178f5205fa 100644\n" + "+index e268f61d8eb0..8faf776cb977 100644\n" + " --- a/net/mptcp/pm_userspace.c\n" + " +++ b/net/mptcp/pm_userspace.c\n" + "-@@ -308,14 +308,17 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -324,14 +324,17 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \n" + " \tlock_sock(sk);\n" + " \n" + "@@ -29,7 +32,7 @@\n" + " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" + " +\t\tspin_unlock_bh(&msk->pm.lock);\n" + " \t\trelease_sock(sk);\n" + "- \t\tgoto out;\n" + "+ \t\tgoto remove_err;\n" + " \t}\n" + " \n" + " \tlist_move(&match->list, &free_list);\n" + "@@ -37,3 +40,6 @@\n" + " \n" + " \tmptcp_pm_remove_addrs(msk, &free_list);\n" + " \n" + "+-- \n" + "+2.45.2\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.6.y | Success | Success | -e39ec0158ffb1d19a5da8eaf313d2e15a4d36eec40ac53dbb6b4f08fedc0e732 +20e83e70484cf9717332f00f1d337569d69c5875a21ea2f602e7ec40d12e2481
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.