diff options
| author |  Paolo Abeni <pabeni@redhat.com>
| 2022-08-04 17:21:25 -0700 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2022-08-05 08:51:28 +0100 |
| commit | c0bf3c6aa444a5ef44acc57ef6cfa53fd4fc1c9b (patch) | |
| tree | e17e53860c401852e80eb815ed850436d4c7ea96 /net/mptcp/subflow.c | |
| parent | nfp: ethtool: fix the display error of `ethtool -m DEVNAME` (diff) | |
| download | linux-c0bf3c6aa444a5ef44acc57ef6cfa53fd4fc1c9b.tar.gz linux-c0bf3c6aa444a5ef44acc57ef6cfa53fd4fc1c9b.tar.bz2 linux-c0bf3c6aa444a5ef44acc57ef6cfa53fd4fc1c9b.zip | |
mptcp: move subflow cleanup in mptcp_destroy_common()
If the mptcp socket creation fails due to a CGROUP_INET_SOCK_CREATE
eBPF program, the MPTCP protocol ends-up leaking all the subflows:
the related cleanup happens in __mptcp_destroy_sock() that is not
invoked in such code path.
Address the issue moving the subflow sockets cleanup in the
mptcp_destroy_common() helper, which is invoked in every msk cleanup
path.
Additionally get rid of the intermediate list_splice_init step, which
is an unneeded relic from the past.
The issue is present since before the reported root cause commit, but
any attempt to backport the fix before that hash will require a complete
rewrite.
Fixes: e16163b6e2 ("mptcp: refactor shutdown and close")
Reported-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Co-developed-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/subflow.c')
| -rw-r--r-- | net/mptcp/subflow.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 901c763dcdbb..c7d49fb6e7bd 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -621,7 +621,8 @@ static void mptcp_sock_destruct(struct sock *sk) sock_orphan(sk); } - mptcp_destroy_common(mptcp_sk(sk)); + /* We don't need to clear msk->subflow, as it's still NULL at this point */ + mptcp_destroy_common(mptcp_sk(sk), 0); inet_sock_destruct(sk); } |