From: Paolo Abeni <pabeni@redhat.com>
Date: Mon, 27 Mar 2023 10:22:21 +0000 (+0200)
Subject: mptcp: avoid unneeded address copy
X-Git-Tag: v6.1.33~170
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9872e8c632528538f4f0d1ec2a73c413de422b08;p=users%2Fdwmw2%2Flinux.git

mptcp: avoid unneeded address copy

[ Upstream commit 2bb9a37f0e194ed95c70603b0efc7898a5a0d9b4 ]

In the syn_recv fallback path, the msk is unused. We can skip
setting the socket address.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 7e8b88ec35ee ("mptcp: consolidate passive msk socket initialization")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 67ddbf6f2e4ee..4995a6281ea16 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -759,8 +759,6 @@ create_child:
 				goto dispose_child;
 			}
 
-			if (new_msk)
-				mptcp_copy_inaddrs(new_msk, child);
 			mptcp_subflow_drop_ctx(child);
 			goto out;
 		}