From mboxrd@z Thu Jan 1 00:00:00 1970 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 17B9B19E838; Tue, 19 Nov 2024 08:36:00 +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=1732005361; cv=none; b=BFFCPERUmUpEr+sSeG5279Y/mlvOBVsugr9QrH3TkVrbJhj3PhklXJ1Rc97aO0Etn88D6sP/AbSBNyz6Yuwfzxxkx0n9C+0QWRK9aIyC7S7+Jn2yRQ4EhtYFZwFT8Ylh58B9flGYs6i08+kNouNILkMUPLICfLSsFKBqJaauqRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732005361; c=relaxed/simple; bh=RAVK/hc3PBBjJKvUp742l4IpMrbyZ6g+SMVTNWnphmg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MV0onoepU9oW7wTI4BHUCqx38XZdXSMwDtRzhE//CbdUzq9uUS4KC3qtlFh8PAXxydidOrujCjxL9VLT8h6P8gDTKlRmoMd3mYaa4TgFZx1xl4EqJMIC51vpIKf/gILk1k1q95q9NkvPjfpvK2vJxE8+gkSkgVU/snSW9WVEadI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sN/NqR2e; 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="sN/NqR2e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDBC5C4CECF; Tue, 19 Nov 2024 08:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732005360; bh=RAVK/hc3PBBjJKvUp742l4IpMrbyZ6g+SMVTNWnphmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sN/NqR2eZ1nBYp+Zfneb6MyZIbYK1GtrgKzeoOmqRgjv+3g8C6CkorKIjAA6zaQRg jmawV+jCVJeGScHrEoGDmhVT60jYPwHixrP6cXBHgD/qeo1PZlDEePmqlks1Kn4/fa UKbn8uXhIDRtf1Xlv5WLuv8psreHVDh5O89ikeQr7h29D2wepYdi/s1W6hkwUYh/sG pzw9Qs6nYNcwH/KTg+37zqnXnvHmIuiyh5rsXfxk/8Nfpy54KuSSWl5EF1//Xx6KjR qgdR/AUFekULyZf8XV6DX5dLRt0t8X/Yf74xZ7qegtV+6AEczEwHZou4ukZDZep1Jj PSk5uiEY6RWNg== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: Geliang Tang , sashal@kernel.org, Matthieu Baerts , Mat Martineau , Jakub Kicinski Subject: [PATCH 6.1.y 2/7] mptcp: define more local variables sk Date: Tue, 19 Nov 2024 09:35:50 +0100 Message-ID: <20241119083547.3234013-11-matttbe@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241119083547.3234013-9-matttbe@kernel.org> References: <20241119083547.3234013-9-matttbe@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4507; i=matttbe@kernel.org; h=from:subject; bh=03IMwEUCz9FS+2ebJybY6rBqT1z4qneYqsTP7bcV6r4=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBnPE3kX9pqXsh8gYNKWLmDRU/bdAZlUPBT+BZN4 5B0LFST4QOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZzxN5AAKCRD2t4JPQmmg cwg6EADuJZAwLLneAsXqEJPcJbo3XAoCMSZmU3s6iwSGvpV2r8wfWg0CsC7XLpaHGKBateLI7Ae boW9ayl52rkzkTLUD0o2bhXrOUcUEqrwMC2O64u+sJ7P7sW3IjjAHWmE48Eq7xwW8yCXiEgGQrD 0XQ625vKsvWzBrOR1cOmsMO7wb4JNIGFcHmLr0KS3eFOcN63tgO7H5jLGI8nhDfmhfGItqB+ZOg jykH/fUTNYhzZp2wzEdrytEj/Guvnii683fRKegUOsoYZJhDKoL5kdvSHoR/Slx4T3Thu/RSFLN /hD8JdBlqEoxsgNMTEAJXLCaMlGSTclIzfCIPQ8+Iz+ahBTHWbMa0taKueTjeb2du9UZ39O+48G lq9XAxyhR1W0bzyc6xAa5Xn7YyU/5DbuwogfUDuCQhgMfmKX9JaUM9HszQohpyJS6cvRcFtyiXy g0sMmeEyTk7+VNK3tImgS9+b8wZSMvTzJreXSjloFSePOnJ9LMs8Frho3Uvgh6mLSPI/BA26zOS ymnnZsUx7NCK83//RxSZTJamUnnC1tKQgR/OxnWlwAwvuI4jZQM4RA3XsZ4bTTfOH+7WxG41QVi J8A3YvXO+jzf+YZ3GcQd9R70mnv6B/47ro5DVzh65yWHDcmkdnpsD2uJt30wHTJ/5kAkRuTPCVs jyuqrWzc/qlBJLA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: 8bit From: Geliang Tang commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream. '(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. Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org Signed-off-by: Jakub Kicinski Stable-dep-of: 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper") Signed-off-by: Matthieu Baerts (NGI0) --- 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 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; + 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; + 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 From mboxrd@z Thu Jan 1 00:00:00 1970 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 1AF8A1CEACB for ; Tue, 19 Nov 2024 14:47:01 +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=1732027621; cv=none; b=CptzARuDo+q7bkjO25DOemnrN/23KDHAGx7SUj61J1vekF7kiTZeRiv3aNmYdgMZ4JYu9jSCHIJznpv2V7IDYgremZj3WeKDXxTCXG5BU0jYNBto6K0JTsWIkAsc41pdMkVrjfExV7m2Tgr5cs2l7NiycxHjGqpUWAIejK4+cls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732027621; c=relaxed/simple; bh=O5xXA10kLRIAl+YsdDERQCcKy42VC+ioO35iHEnYsQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VApF0VzWy96pCZGa72avRwLlNm4f7rAJo5pIXxvGKeQeiTSHpzNFyxhO0HIeR0DO/xAlqb/XSqeIG0pR439XpeabOdT7tXTvEU93HxX95SavygJkNUe6CkajRuZDso3qUKu1L3W1gIIgzIlCnd+r9fvdpCi+HhtY1pC+k063hcM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KsU0t/8U; 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="KsU0t/8U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86226C4CECF; Tue, 19 Nov 2024 14:47:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732027621; bh=O5xXA10kLRIAl+YsdDERQCcKy42VC+ioO35iHEnYsQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KsU0t/8U3Ef3GtGFUqQchPA/7tEMSA+jqzc02anKZAhw7B89ZIx7J9gTtM9u6OQFe wRMyDA88E3a+mrWHqXwTAydbS8G5TQz7763TL+xQ1G3yuLZXd4ipCrFwIRjb4aDtWc ndoZSFw7YEurLhFOcal/iPkGvRyDr/BlCjfjLmkhZ0pc2U9/qgYhXFwHAbEYtxjjtu MyM7XlUgqc61JyV9RCkDP1STS0ig6vlGS52Ixi+baz0yKXbY+7DHI6gxxHjz99co5+ K9KIwWstUhywRA8DNLZbtWriSrgA493cBPu7cPKfs7pEfirF4pvM+Yk3PLmil9wYRp mlJKHWtCNvDwQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Sasha Levin Subject: Re: [PATCH 6.1.y 2/7] mptcp: define more local variables sk Date: Tue, 19 Nov 2024 09:46:59 -0500 Message-ID: <20241119083547.3234013-11-matttbe@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241119083547.3234013-11-matttbe@kernel.org> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20241119144659._wk2b2le9qjOs0zDyx0Ix3zUvkAgklTEN71TKVVy1IE@z> [ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 14cb0e0bf39bd10429ba14e9e2f905f1144226fc WARNING: Author mismatch between patch and upstream commit: Backport author: "Matthieu Baerts (NGI0)" Commit author: Geliang Tang 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. + '(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 Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org Signed-off-by: Jakub Kicinski +Stable-dep-of: 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper") +Signed-off-by: Matthieu Baerts (NGI0) --- 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 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |