diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2020-04-30 15:03:22 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-30 12:34:07 -0700 |
| commit | ac2b47fb92c50682d89d7350a491a6a392bac5dd (patch) | |
| tree | 3d4f969f7f09664e88d7a35e811e174bcd6e1a49 | |
| parent | Merge branch 'mptcp-fix-incoming-options-parsing' (diff) | |
| download | wireguard-linux-ac2b47fb92c50682d89d7350a491a6a392bac5dd.tar.xz wireguard-linux-ac2b47fb92c50682d89d7350a491a6a392bac5dd.zip | |
mptcp: fix uninitialized value access
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/mptcp/subflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ out: /* 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; |