[MPTCP] [PATCH net v2] mptcp: fix uninitialized value access

[MPTCP] [PATCH net v2] mptcp: fix uninitialized value access

[Paolo Abeni]

[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]

tcp_v{4,6}_syn_recv_sock() set 'own_req' only when returning
a not NULL 'child', let's check 'own_req' only if child is
available to avoid an - unharmful - UBSAN splat.

v1 -> v2:
 - reference the correct hash

Fixes: 4c8941de781c ("mptcp: avoid flipping mp_capable field in syn_recv_sock()")
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
 net/mptcp/subflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index bad998529767..67a4e35d4838 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -523,7 +523,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
 	/* check for expected invariant - should never trigger, just help
 	 * catching eariler subtle bugs
 	 */
-	WARN_ON_ONCE(*own_req && child && tcp_sk(child)->is_mptcp &&
+	WARN_ON_ONCE(child && *own_req && tcp_sk(child)->is_mptcp &&
 		     (!mptcp_subflow_ctx(child) ||
 		      !mptcp_subflow_ctx(child)->conn));
 	return child;
-- 
2.21.1

[PATCH net v2] mptcp: fix uninitialized value access

[Paolo Abeni]

tcp_v{4,6}_syn_recv_sock() set 'own_req' only when returning
a not NULL 'child', let's check 'own_req' only if child is
available to avoid an - unharmful - UBSAN splat.

v1 -> v2:
 - reference the correct hash

Fixes: 4c8941de781c ("mptcp: avoid flipping mp_capable field in syn_recv_sock()")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/subflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index bad998529767..67a4e35d4838 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -523,7 +523,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
 	/* check for expected invariant - should never trigger, just help
 	 * catching eariler subtle bugs
 	 */
-	WARN_ON_ONCE(*own_req && child && tcp_sk(child)->is_mptcp &&
+	WARN_ON_ONCE(child && *own_req && tcp_sk(child)->is_mptcp &&
 		     (!mptcp_subflow_ctx(child) ||
 		      !mptcp_subflow_ctx(child)->conn));
 	return child;
-- 
2.21.1

[MPTCP] Re: [PATCH net v2] mptcp: fix uninitialized value access

[David Miller]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

From: Paolo Abeni <pabeni(a)redhat.com>
Date: Thu, 30 Apr 2020 15:03:22 +0200

> tcp_v{4,6}_syn_recv_sock() set 'own_req' only when returning
> a not NULL 'child', let's check 'own_req' only if child is
> available to avoid an - unharmful - UBSAN splat.
> 
> v1 -> v2:
>  - reference the correct hash
> 
> Fixes: 4c8941de781c ("mptcp: avoid flipping mp_capable field in syn_recv_sock()")
> Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>

Applied.

Re: [PATCH net v2] mptcp: fix uninitialized value access

[David Miller]

From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 30 Apr 2020 15:03:22 +0200

> tcp_v{4,6}_syn_recv_sock() set 'own_req' only when returning
> a not NULL 'child', let's check 'own_req' only if child is
> available to avoid an - unharmful - UBSAN splat.
> 
> v1 -> v2:
>  - reference the correct hash
> 
> Fixes: 4c8941de781c ("mptcp: avoid flipping mp_capable field in syn_recv_sock()")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Applied.