Skip to contentSkip to conversation

subflow: don't increment msk refcount on join connect completion

PATCH In review Florian Westphal 3 participants 3 messages Nov 25, 2019 – Nov 26, 2019

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author
#0 lore raw

PATCH 1/1 subflow: don't increment msk refcount on join connect completion

squashto: mptcp: Add handling of outgoing MP_JOIN requests

The connecting socket already has a refcount, this additional increase is never decremented, resulting in the mptcp socket to never get freed.

Signed-off-by Florian Westphal <fw(a)strlen.de>
---
 net/mptcp/subflow.c | 1 -
 1 file changed, 1 deletion(-)
net/mptcp/subflow.c +0 -1
index e6a512bf6230..ba46c0b3a6d7 100644
@@ -38,7 +38,6 @@ static int subflow_rebuild_header(struct sock *sk)
 		err = mptcp_token_new_connect(sk);
 	} else if (subflow->request_join && !subflow->local_nonce) {
 		pr_debug("subflow=%p", sk);
-		mptcp_token_get_sock(subflow->token);
 
 		do {
 			get_random_bytes(&subflow->local_nonce, sizeof(u32));
Signature · 1 line
2.23.0
#1 lore raw
Quoted 15 lines · Florian Westphal

squashto: mptcp: Add handling of outgoing MP_JOIN requests

The connecting socket already has a refcount, this additional increase is never decremented, resulting in the mptcp socket to never get freed.

Signed-off-by Florian Westphal <fw(a)strlen.de>
---
 net/mptcp/subflow.c | 1 -
 1 file changed, 1 deletion(-)
net/mptcp/subflow.c +0 -0
index e6a512bf6230..ba46c0b3a6d7 100644

net/mptcp/subflow.c static int subflow_rebuild_header(struct sock *sk) · line 43

Quoted 7 lines
net/mptcp/subflow.c +0 -1
@@ -38,7 +38,6 @@ static int subflow_rebuild_header(struct sock *sk)
 		err = mptcp_token_new_connect(sk);
 	} else if (subflow->request_join && !subflow->local_nonce) {
 		pr_debug("subflow=%p", sk);
-		mptcp_token_get_sock(subflow->token);
 
 		do {
 			get_random_bytes(&subflow->local_nonce, sizeof(u32));

yep, it looks like this refcnt is really leaked, ACK!

Paolo

#2 lore raw

Hi Florian, Paolo,

Quoted 21 lines · Paolo Abeni
Quoted 20 lines · Florian Westphal

squashto: mptcp: Add handling of outgoing MP_JOIN requests

The connecting socket already has a refcount, this additional increase is never decremented, resulting in the mptcp socket to never get freed.

Signed-off-by Florian Westphal <fw(a)strlen.de>
---
  net/mptcp/subflow.c | 1 -
  1 file changed, 1 deletion(-)
net/mptcp/subflow.c +0 -1
index e6a512bf6230..ba46c0b3a6d7 100644
@@ -38,7 +38,6 @@ static int subflow_rebuild_header(struct sock *sk)
  		err = mptcp_token_new_connect(sk);
  	} else if (subflow->request_join && !subflow->local_nonce) {
  		pr_debug("subflow=%p", sk);
-		mptcp_token_get_sock(subflow->token);
 
Quoted 4 lines

net/mptcp/subflow.c static int subflow_rebuild_header(struct sock *sk) · line 43

Quoted 2 lines
net/mptcp/subflow.c +0 -0
  		do {
  			get_random_bytes(&subflow->local_nonce, sizeof(u32));

yep, it looks like this refcnt is really leaked, ACK!

Good catch! Thank you for the patch and the review!

- 8aa42d827a74: "squashed" in "mptcp: Add handling of outgoing MP_JOIN requests"
- 4d53ef252ed5..3af80e92c8cd: result

Tests and sync in progress.

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium