diff for duplicates of <20241119083547.3234013-11-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 3a4dba8..f96c9fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,151 +1,159 @@ -From: Geliang Tang <geliang.tang@suse.com> +[ Sasha's backport helper bot ] -commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream. +Hi, -'(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(), -mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c, -it's worth adding a local variable sk to point it. +The upstream commit SHA1 provided is correct: 14cb0e0bf39bd10429ba14e9e2f905f1144226fc -Reviewed-by: Matthieu Baerts <matttbe@kernel.org> -Signed-off-by: Geliang Tang <geliang.tang@suse.com> -Signed-off-by: Mat Martineau <martineau@kernel.org> -Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org -Signed-off-by: Jakub Kicinski <kuba@kernel.org> -Stable-dep-of: 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper") -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> ---- - net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++----------- - 1 file changed, 20 insertions(+), 11 deletions(-) +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Geliang Tang <geliang.tang@suse.com> -diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c -index 748e3876ec6d..530f414e57d6 100644 ---- a/net/mptcp/pm_userspace.c -+++ b/net/mptcp/pm_userspace.c -@@ -185,6 +185,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) - struct mptcp_pm_addr_entry addr_val; - struct mptcp_sock *msk; - int err = -EINVAL; -+ struct sock *sk; - u32 token_val; - - if (!addr || !token) { -@@ -200,6 +201,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) - return err; - } - -+ sk = (struct sock *)msk; + +Status in newer kernel trees: +6.11.y | Present (exact SHA1) +6.6.y | Not found +6.1.y | Not found + +Note: The patch differs from the upstream commit: +--- +--- - 2024-11-19 08:47:06.856885002 -0500 ++++ /tmp/tmp.6gMpdrO84b 2024-11-19 08:47:06.852544679 -0500 +@@ -1,3 +1,5 @@ ++commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream. + - if (!mptcp_pm_is_userspace(msk)) { - GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); - goto announce_err; -@@ -223,7 +226,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) - goto announce_err; - } - -- lock_sock((struct sock *)msk); -+ lock_sock(sk); - spin_lock_bh(&msk->pm.lock); - - if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { -@@ -233,11 +236,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) - } - - spin_unlock_bh(&msk->pm.lock); -- release_sock((struct sock *)msk); -+ release_sock(sk); - - err = 0; - announce_err: -- sock_put((struct sock *)msk); -+ sock_put(sk); - return err; - } - -@@ -284,6 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - struct mptcp_sock *msk; - LIST_HEAD(free_list); - int err = -EINVAL; -+ struct sock *sk; - u32 token_val; - u8 id_val; - -@@ -301,6 +305,8 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - return err; - } - -+ sk = (struct sock *)msk; + '(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(), + mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c, + it's worth adding a local variable sk to point it. +@@ -7,15 +9,17 @@ + Signed-off-by: Mat Martineau <martineau@kernel.org> + Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org + Signed-off-by: Jakub Kicinski <kuba@kernel.org> ++Stable-dep-of: 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper") ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + + diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c +-index 7bb2b29e5b964..5c01b9bc619a8 100644 ++index 748e3876ec6d..530f414e57d6 100644 + --- a/net/mptcp/pm_userspace.c + +++ b/net/mptcp/pm_userspace.c +-@@ -152,6 +152,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -185,6 +185,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) + struct mptcp_pm_addr_entry addr_val; + struct mptcp_sock *msk; + int err = -EINVAL; +@@ -23,7 +27,7 @@ + u32 token_val; + + if (!addr || !token) { +-@@ -167,6 +168,8 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -200,6 +201,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) + return err; + } + +@@ -32,7 +36,7 @@ + if (!mptcp_pm_is_userspace(msk)) { + GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); + goto announce_err; +-@@ -190,7 +193,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -223,7 +226,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) + goto announce_err; + } + +@@ -41,7 +45,7 @@ + spin_lock_bh(&msk->pm.lock); + + if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { +-@@ -200,11 +203,11 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -233,11 +236,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) + } + + spin_unlock_bh(&msk->pm.lock); +@@ -55,7 +59,7 @@ + return err; + } + +-@@ -251,6 +254,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -284,6 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + struct mptcp_sock *msk; + LIST_HEAD(free_list); + int err = -EINVAL; +@@ -63,7 +67,7 @@ + u32 token_val; + u8 id_val; + +-@@ -268,6 +272,8 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -301,6 +305,8 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + return err; + } + +@@ -72,7 +76,7 @@ + if (!mptcp_pm_is_userspace(msk)) { + GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); + goto remove_err; +-@@ -278,7 +284,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -311,7 +317,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + goto remove_err; + } + +@@ -81,7 +85,7 @@ + + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { + if (entry->addr.id == id_val) { +-@@ -289,7 +295,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -322,7 +328,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + + if (!match) { + GENL_SET_ERR_MSG(info, "address with specified id not found"); +@@ -90,7 +94,7 @@ + goto remove_err; + } + +-@@ -297,15 +303,15 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -330,15 +336,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + + mptcp_pm_remove_addrs(msk, &free_list); + +@@ -109,7 +113,7 @@ + return err; + } + +-@@ -518,6 +524,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ++@@ -560,6 +566,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, + { + struct mptcp_sock *msk; + int ret = -EINVAL; +@@ -117,7 +121,7 @@ + u32 token_val; + + token_val = nla_get_u32(token); +-@@ -526,6 +533,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ++@@ -568,6 +575,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, + if (!msk) + return ret; + +@@ -126,7 +130,7 @@ + if (!mptcp_pm_is_userspace(msk)) + goto set_flags_err; + +-@@ -533,11 +542,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ++@@ -575,11 +584,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, + rem->addr.family == AF_UNSPEC) + goto set_flags_err; + +@@ -141,3 +145,6 @@ + + sock_put(sk); + return ret; + } ++-- ++2.45.2 + - if (!mptcp_pm_is_userspace(msk)) { - GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); - goto remove_err; -@@ -311,7 +317,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - goto remove_err; - } - -- lock_sock((struct sock *)msk); -+ lock_sock(sk); - - list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { - if (entry->addr.id == id_val) { -@@ -322,7 +328,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - - if (!match) { - GENL_SET_ERR_MSG(info, "address with specified id not found"); -- release_sock((struct sock *)msk); -+ release_sock(sk); - goto remove_err; - } - -@@ -330,15 +336,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - - mptcp_pm_remove_addrs(msk, &free_list); - -- release_sock((struct sock *)msk); -+ release_sock(sk); - - list_for_each_entry_safe(match, entry, &free_list, list) { -- sock_kfree_s((struct sock *)msk, match, sizeof(*match)); -+ sock_kfree_s(sk, match, sizeof(*match)); - } - - err = 0; - remove_err: -- sock_put((struct sock *)msk); -+ sock_put(sk); - return err; - } - -@@ -560,6 +566,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, - { - struct mptcp_sock *msk; - int ret = -EINVAL; -+ struct sock *sk; - u32 token_val; - - token_val = nla_get_u32(token); -@@ -568,6 +575,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, - if (!msk) - return ret; - -+ sk = (struct sock *)msk; -+ - if (!mptcp_pm_is_userspace(msk)) - goto set_flags_err; - -@@ -575,11 +584,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, - rem->addr.family == AF_UNSPEC) - goto set_flags_err; - -- lock_sock((struct sock *)msk); -+ lock_sock(sk); - ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); -- release_sock((struct sock *)msk); -+ release_sock(sk); - - set_flags_err: -- sock_put((struct sock *)msk); -+ sock_put(sk); - return ret; - } --- -2.45.2 +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.1.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index f4ff915..b52c48b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,167 +1,169 @@ - "ref\020241119083547.3234013-9-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.1.y 2/7] mptcp: define more local variables sk\0" - "Date\0Tue, 19 Nov 2024 09:35:50 +0100\0" - "To\0mptcp@lists.linux.dev" - stable@vger.kernel.org - " gregkh@linuxfoundation.org\0" - "Cc\0Geliang Tang <geliang.tang@suse.com>" - sashal@kernel.org - Matthieu Baerts <matttbe@kernel.org> - Mat Martineau <martineau@kernel.org> - " Jakub Kicinski <kuba@kernel.org>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.1.y 2/7] mptcp: define more local variables sk\0" + "Date\0Tue, 19 Nov 2024 09:46:59 -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 <geliang.tang@suse.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream.\n" + "Hi,\n" "\n" - "'(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(),\n" - "mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c,\n" - "it's worth adding a local variable sk to point it.\n" + "The upstream commit SHA1 provided is correct: 14cb0e0bf39bd10429ba14e9e2f905f1144226fc\n" "\n" - "Reviewed-by: Matthieu Baerts <matttbe@kernel.org>\n" - "Signed-off-by: Geliang Tang <geliang.tang@suse.com>\n" - "Signed-off-by: Mat Martineau <martineau@kernel.org>\n" - "Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org\n" - "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" - "Stable-dep-of: 06afe09091ee (\"mptcp: add userspace_pm_lookup_addr_by_id helper\")\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "---\n" - " net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++-----------\n" - " 1 file changed, 20 insertions(+), 11 deletions(-)\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: \"Matthieu Baerts (NGI0)\" <matttbe@kernel.org>\n" + "Commit author: Geliang Tang <geliang.tang@suse.com>\n" "\n" - "diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" - "index 748e3876ec6d..530f414e57d6 100644\n" - "--- a/net/mptcp/pm_userspace.c\n" - "+++ b/net/mptcp/pm_userspace.c\n" - "@@ -185,6 +185,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" - " \tstruct mptcp_pm_addr_entry addr_val;\n" - " \tstruct mptcp_sock *msk;\n" - " \tint err = -EINVAL;\n" - "+\tstruct sock *sk;\n" - " \tu32 token_val;\n" - " \n" - " \tif (!addr || !token) {\n" - "@@ -200,6 +201,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" - " \t\treturn err;\n" - " \t}\n" - " \n" - "+\tsk = (struct sock *)msk;\n" + "\n" + "Status in newer kernel trees:\n" + "6.11.y | Present (exact SHA1)\n" + "6.6.y | Not found\n" + "6.1.y | Not found\n" + "\n" + "Note: The patch differs from the upstream commit:\n" + "---\n" + "--- -\t2024-11-19 08:47:06.856885002 -0500\n" + "+++ /tmp/tmp.6gMpdrO84b\t2024-11-19 08:47:06.852544679 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream.\n" "+\n" - " \tif (!mptcp_pm_is_userspace(msk)) {\n" - " \t\tGENL_SET_ERR_MSG(info, \"invalid request; userspace PM not selected\");\n" - " \t\tgoto announce_err;\n" - "@@ -223,7 +226,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" - " \t\tgoto announce_err;\n" - " \t}\n" - " \n" - "-\tlock_sock((struct sock *)msk);\n" - "+\tlock_sock(sk);\n" - " \tspin_lock_bh(&msk->pm.lock);\n" - " \n" - " \tif (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {\n" - "@@ -233,11 +236,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" - " \t}\n" - " \n" - " \tspin_unlock_bh(&msk->pm.lock);\n" - "-\trelease_sock((struct sock *)msk);\n" - "+\trelease_sock(sk);\n" - " \n" - " \terr = 0;\n" - " announce_err:\n" - "-\tsock_put((struct sock *)msk);\n" - "+\tsock_put(sk);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -284,6 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \tstruct mptcp_sock *msk;\n" - " \tLIST_HEAD(free_list);\n" - " \tint err = -EINVAL;\n" - "+\tstruct sock *sk;\n" - " \tu32 token_val;\n" - " \tu8 id_val;\n" - " \n" - "@@ -301,6 +305,8 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \t\treturn err;\n" - " \t}\n" - " \n" - "+\tsk = (struct sock *)msk;\n" + " '(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(),\n" + " mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c,\n" + " it's worth adding a local variable sk to point it.\n" + "@@ -7,15 +9,17 @@\n" + " Signed-off-by: Mat Martineau <martineau@kernel.org>\n" + " Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org\n" + " Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" + "+Stable-dep-of: 06afe09091ee (\"mptcp: add userspace_pm_lookup_addr_by_id helper\")\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++-----------\n" + " 1 file changed, 20 insertions(+), 11 deletions(-)\n" + " \n" + " diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" + "-index 7bb2b29e5b964..5c01b9bc619a8 100644\n" + "+index 748e3876ec6d..530f414e57d6 100644\n" + " --- a/net/mptcp/pm_userspace.c\n" + " +++ b/net/mptcp/pm_userspace.c\n" + "-@@ -152,6 +152,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -185,6 +185,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" + " \tstruct mptcp_pm_addr_entry addr_val;\n" + " \tstruct mptcp_sock *msk;\n" + " \tint err = -EINVAL;\n" + "@@ -23,7 +27,7 @@\n" + " \tu32 token_val;\n" + " \n" + " \tif (!addr || !token) {\n" + "-@@ -167,6 +168,8 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -200,6 +201,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" + " \t\treturn err;\n" + " \t}\n" + " \n" + "@@ -32,7 +36,7 @@\n" + " \tif (!mptcp_pm_is_userspace(msk)) {\n" + " \t\tGENL_SET_ERR_MSG(info, \"invalid request; userspace PM not selected\");\n" + " \t\tgoto announce_err;\n" + "-@@ -190,7 +193,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -223,7 +226,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" + " \t\tgoto announce_err;\n" + " \t}\n" + " \n" + "@@ -41,7 +45,7 @@\n" + " \tspin_lock_bh(&msk->pm.lock);\n" + " \n" + " \tif (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {\n" + "-@@ -200,11 +203,11 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -233,11 +236,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)\n" + " \t}\n" + " \n" + " \tspin_unlock_bh(&msk->pm.lock);\n" + "@@ -55,7 +59,7 @@\n" + " \treturn err;\n" + " }\n" + " \n" + "-@@ -251,6 +254,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -284,6 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \tstruct mptcp_sock *msk;\n" + " \tLIST_HEAD(free_list);\n" + " \tint err = -EINVAL;\n" + "@@ -63,7 +67,7 @@\n" + " \tu32 token_val;\n" + " \tu8 id_val;\n" + " \n" + "-@@ -268,6 +272,8 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -301,6 +305,8 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \t\treturn err;\n" + " \t}\n" + " \n" + "@@ -72,7 +76,7 @@\n" + " \tif (!mptcp_pm_is_userspace(msk)) {\n" + " \t\tGENL_SET_ERR_MSG(info, \"invalid request; userspace PM not selected\");\n" + " \t\tgoto remove_err;\n" + "-@@ -278,7 +284,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -311,7 +317,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \t\tgoto remove_err;\n" + " \t}\n" + " \n" + "@@ -81,7 +85,7 @@\n" + " \n" + " \tlist_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {\n" + " \t\tif (entry->addr.id == id_val) {\n" + "-@@ -289,7 +295,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -322,7 +328,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \n" + " \tif (!match) {\n" + " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" + "@@ -90,7 +94,7 @@\n" + " \t\tgoto remove_err;\n" + " \t}\n" + " \n" + "-@@ -297,15 +303,15 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -330,15 +336,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \n" + " \tmptcp_pm_remove_addrs(msk, &free_list);\n" + " \n" + "@@ -109,7 +113,7 @@\n" + " \treturn err;\n" + " }\n" + " \n" + "-@@ -518,6 +524,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + "+@@ -560,6 +566,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + " {\n" + " \tstruct mptcp_sock *msk;\n" + " \tint ret = -EINVAL;\n" + "@@ -117,7 +121,7 @@\n" + " \tu32 token_val;\n" + " \n" + " \ttoken_val = nla_get_u32(token);\n" + "-@@ -526,6 +533,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + "+@@ -568,6 +575,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + " \tif (!msk)\n" + " \t\treturn ret;\n" + " \n" + "@@ -126,7 +130,7 @@\n" + " \tif (!mptcp_pm_is_userspace(msk))\n" + " \t\tgoto set_flags_err;\n" + " \n" + "-@@ -533,11 +542,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + "+@@ -575,11 +584,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + " \t rem->addr.family == AF_UNSPEC)\n" + " \t\tgoto set_flags_err;\n" + " \n" + "@@ -141,3 +145,6 @@\n" + " +\tsock_put(sk);\n" + " \treturn ret;\n" + " }\n" + "+-- \n" + "+2.45.2\n" "+\n" - " \tif (!mptcp_pm_is_userspace(msk)) {\n" - " \t\tGENL_SET_ERR_MSG(info, \"invalid request; userspace PM not selected\");\n" - " \t\tgoto remove_err;\n" - "@@ -311,7 +317,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \t\tgoto remove_err;\n" - " \t}\n" - " \n" - "-\tlock_sock((struct sock *)msk);\n" - "+\tlock_sock(sk);\n" - " \n" - " \tlist_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {\n" - " \t\tif (entry->addr.id == id_val) {\n" - "@@ -322,7 +328,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \n" - " \tif (!match) {\n" - " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" - "-\t\trelease_sock((struct sock *)msk);\n" - "+\t\trelease_sock(sk);\n" - " \t\tgoto remove_err;\n" - " \t}\n" - " \n" - "@@ -330,15 +336,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \n" - " \tmptcp_pm_remove_addrs(msk, &free_list);\n" - " \n" - "-\trelease_sock((struct sock *)msk);\n" - "+\trelease_sock(sk);\n" - " \n" - " \tlist_for_each_entry_safe(match, entry, &free_list, list) {\n" - "-\t\tsock_kfree_s((struct sock *)msk, match, sizeof(*match));\n" - "+\t\tsock_kfree_s(sk, match, sizeof(*match));\n" - " \t}\n" - " \n" - " \terr = 0;\n" - " remove_err:\n" - "-\tsock_put((struct sock *)msk);\n" - "+\tsock_put(sk);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -560,6 +566,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" - " {\n" - " \tstruct mptcp_sock *msk;\n" - " \tint ret = -EINVAL;\n" - "+\tstruct sock *sk;\n" - " \tu32 token_val;\n" - " \n" - " \ttoken_val = nla_get_u32(token);\n" - "@@ -568,6 +575,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" - " \tif (!msk)\n" - " \t\treturn ret;\n" - " \n" - "+\tsk = (struct sock *)msk;\n" - "+\n" - " \tif (!mptcp_pm_is_userspace(msk))\n" - " \t\tgoto set_flags_err;\n" - " \n" - "@@ -575,11 +584,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" - " \t rem->addr.family == AF_UNSPEC)\n" - " \t\tgoto set_flags_err;\n" - " \n" - "-\tlock_sock((struct sock *)msk);\n" - "+\tlock_sock(sk);\n" - " \tret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);\n" - "-\trelease_sock((struct sock *)msk);\n" - "+\trelease_sock(sk);\n" - " \n" - " set_flags_err:\n" - "-\tsock_put((struct sock *)msk);\n" - "+\tsock_put(sk);\n" - " \treturn ret;\n" - " }\n" - "-- \n" - 2.45.2 + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.1.y | Success | Success | -bffc1bdf03cb4ba6f889abd2a9ca0a585c3d68d3d92a6d957b4620c4985f77ee +ff09366f695ef6a8ceb34cc3cb1d08c77cd4be40209254c437bd53295572d481
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.