summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2020-01-29 15:54:43 +0100
committerDavid S. Miller <davem@davemloft.net>2020-01-29 17:45:19 +0100
commitc9fd9c5f4b935516ba8be31f2e7590caf0bc2c6f (patch)
treea6194eac628d6c1a180e1a8c99a50c49f14f9653 /net
parent44efc78d0e464ce70b45b165c005f8bedc17952e (diff)
downloadlinux-c9fd9c5f4b935516ba8be31f2e7590caf0bc2c6f.tar.gz
linux-c9fd9c5f4b935516ba8be31f2e7590caf0bc2c6f.tar.bz2
linux-c9fd9c5f4b935516ba8be31f2e7590caf0bc2c6f.zip
mptcp: defer freeing of cached ext until last moment
access to msk->cached_ext is only legal if the msk is locked or all concurrent accesses are impossible. Furthermore, once we start to tear down, we must make sure nothing else can step in and allocate a new cached ext. So place this code in the destroy callback where it belongs. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/mptcp/protocol.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 39fdca79ce90..f1b1160dbbb4 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -654,8 +654,6 @@ static void __mptcp_close(struct sock *sk, long timeout)
__mptcp_close_ssk(sk, ssk, subflow, timeout);
}
- if (msk->cached_ext)
- __skb_ext_put(msk->cached_ext);
release_sock(sk);
sk_common_release(sk);
}
@@ -776,6 +774,10 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
static void mptcp_destroy(struct sock *sk)
{
+ struct mptcp_sock *msk = mptcp_sk(sk);
+
+ if (msk->cached_ext)
+ __skb_ext_put(msk->cached_ext);
}
static int mptcp_setsockopt(struct sock *sk, int level, int optname,