Recently, Paolo fixed a bug where a TCP-specific helper was used with an
MPTCP socket [1]. The bug was not detected by fuzzer or static analysis.

Following this, it has been suggested to add a check, only in debug
mode. This is what this series is doing.

The series has been split to be upstreamed: a preparation patch for
MPTCP, the modification for TCP, then for MPTCP. It is not clear if it
would be OK to add that upstream. If not, we can squash these three
patches in "DO-NOT-MERGE: mptcp: improve code coverage for CI" commit we
have in our export tree.

Note that the MPTCP Token kUnit test needs to be adapted for this new
check. This is what is done in patch 1/3.

Link: https://lore.kernel.org/mptcp/35875ef9cb7194563b580e14c71cc8cb065f846c.1706043786.git.pabeni@redhat.com/ [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Changes in v4:
- Patch 2 and 3 have been modified, please the changelog on each patch
- Link to v3: https://lore.kernel.org/r/20240207-mptcp-check-protocol-v3-0-77c69c596f55@kernel.org

Changes in v3:
- Patch 2 and 3 have been modified, please the changelog on each patch
- Link to v2: https://lore.kernel.org/r/20240201-mptcp-check-protocol-v2-0-1e253ef51990@kernel.org

Changes in v2:
- Patch 2 and 3 have been modified, please the changelog on each patch
- Link to v1: https://lore.kernel.org/r/20240131-mptcp-check-protocol-v1-0-a06067f0bd08@kernel.org

---
Matthieu Baerts (NGI0) (3):
      mptcp: token kunit: set protocol
      mptcp: check the protocol in tcp_sk() with DEBUG_NET
      mptcp: check the protocol in mptcp_sk() with DEBUG_NET

 net/mptcp/protocol.h   | 16 ++++++++++++++++
 net/mptcp/token_test.c |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
---
base-commit: 52e05de42e1094a943053af93ea08c51a44091f7
change-id: 20240131-mptcp-check-protocol-e32e53d04a75

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

On Thu, 15 Feb 2024, Matthieu Baerts (NGI0) wrote:

> Recently, Paolo fixed a bug where a TCP-specific helper was used with an
> MPTCP socket [1]. The bug was not detected by fuzzer or static analysis.
>
> Following this, it has been suggested to add a check, only in debug
> mode. This is what this series is doing.
>
> The series has been split to be upstreamed: a preparation patch for
> MPTCP, the modification for TCP, then for MPTCP. It is not clear if it
> would be OK to add that upstream. If not, we can squash these three
> patches in "DO-NOT-MERGE: mptcp: improve code coverage for CI" commit we
> have in our export tree.
>
> Note that the MPTCP Token kUnit test needs to be adapted for this new
> check. This is what is done in patch 1/3.
>
> Link: https://lore.kernel.org/mptcp/35875ef9cb7194563b580e14c71cc8cb065f846c.1706043786.git.pabeni@redhat.com/ [1]
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> Changes in v4:
> - Patch 2 and 3 have been modified, please the changelog on each patch
> - Link to v3: https://lore.kernel.org/r/20240207-mptcp-check-protocol-v3-0-77c69c596f55@kernel.org

Thanks Matthieu, v4 LGTM:

Reviewed-by: Mat Martineau <martineau@kernel.org>

>
> Changes in v3:
> - Patch 2 and 3 have been modified, please the changelog on each patch
> - Link to v2: https://lore.kernel.org/r/20240201-mptcp-check-protocol-v2-0-1e253ef51990@kernel.org
>
> Changes in v2:
> - Patch 2 and 3 have been modified, please the changelog on each patch
> - Link to v1: https://lore.kernel.org/r/20240131-mptcp-check-protocol-v1-0-a06067f0bd08@kernel.org
>
> ---
> Matthieu Baerts (NGI0) (3):
>      mptcp: token kunit: set protocol
>      mptcp: check the protocol in tcp_sk() with DEBUG_NET
>      mptcp: check the protocol in mptcp_sk() with DEBUG_NET
>
> net/mptcp/protocol.h   | 16 ++++++++++++++++
> net/mptcp/token_test.c |  7 ++++++-
> 2 files changed, 22 insertions(+), 1 deletion(-)
> ---
> base-commit: 52e05de42e1094a943053af93ea08c51a44091f7
> change-id: 20240131-mptcp-check-protocol-e32e53d04a75
>
> Best regards,
> -- 
> Matthieu Baerts (NGI0) <matttbe@kernel.org>
>
>

Hi Mat,

On 16/02/2024 00:01, Mat Martineau wrote:
> On Thu, 15 Feb 2024, Matthieu Baerts (NGI0) wrote:
> 
>> Recently, Paolo fixed a bug where a TCP-specific helper was used with an
>> MPTCP socket [1]. The bug was not detected by fuzzer or static analysis.
>>
>> Following this, it has been suggested to add a check, only in debug
>> mode. This is what this series is doing.
>>
>> The series has been split to be upstreamed: a preparation patch for
>> MPTCP, the modification for TCP, then for MPTCP. It is not clear if it
>> would be OK to add that upstream. If not, we can squash these three
>> patches in "DO-NOT-MERGE: mptcp: improve code coverage for CI" commit we
>> have in our export tree.
>>
>> Note that the MPTCP Token kUnit test needs to be adapted for this new
>> check. This is what is done in patch 1/3.
>>
>> Link:
>> https://lore.kernel.org/mptcp/35875ef9cb7194563b580e14c71cc8cb065f846c.1706043786.git.pabeni@redhat.com/ [1]
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> ---
>> Changes in v4:
>> - Patch 2 and 3 have been modified, please the changelog on each patch
>> - Link to v3:
>> https://lore.kernel.org/r/20240207-mptcp-check-protocol-v3-0-77c69c596f55@kernel.org
> 
> Thanks Matthieu, v4 LGTM:
> 
> Reviewed-by: Mat Martineau <martineau@kernel.org>

Thank you for the review!

Now in our tree:

New patches for t/upstream:
- c3442c02434d: mptcp: token kunit: set protocol
- 63ecd0ec9a16: mptcp: check the protocol in tcp_sk() with DEBUG_NET
- 6b84a8f44c8a: mptcp: check the protocol in mptcp_sk() with DEBUG_NET
- Results: 0b8245446c36..27e2360c238b (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20240216T104727

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.