| Message ID | 61aae3730b8c35c2e0b8b70f5f2fe5170067f5c8.1717512099.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | cb8305364a4e22ea255b7f48f7e5c8f034e5664c |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [mptcp-net] mptcp: ensure snd_una is properly initialized on connect | expand |
| Context | Check | Description |
|---|---|---|
| matttbe/build | success | Build and static analysis OK |
| matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| matttbe/shellcheck | success | MPTCP selftests files have not been modified |
| matttbe/KVM_Validation__normal | success | Success! ✅ |
| matttbe/KVM_Validation__debug | success | Success! ✅ |
| matttbe/KVM_Validation__btf__only_bpftest_all_ | success | Success! ✅ |
Hi Paolo,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/9369952349
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/45ea564d5e7e
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=858724
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normal
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
On Tue, 4 Jun 2024, Paolo Abeni wrote: > This is strictly related to commit fb7a0d334894 ("mptcp: ensure snd_nxt > is properly initialized on connect"). It turns out that syzkaller can > trigger the retransmit after fallback and before processing any other > incoming packet - so that snd_una is still left uninitialized. > > Address the issue explicitly initializing snd_una together with snd_nxt > and write_seq. > > Suggested-by: Mat Martineau <martineau@kernel.org> > Fixes: 8fd738049ac3 ("mptcp: fallback in case of simultaneous connect") > Cc: stable@vger.kernel.org > Reported-by: Christoph Paasch <cpaasch@apple.com> > Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/485 > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > net/mptcp/protocol.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 2f8f32cd31d3..1c5b7796daaf 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -3735,6 +3735,7 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) > > WRITE_ONCE(msk->write_seq, subflow->idsn); > WRITE_ONCE(msk->snd_nxt, subflow->idsn); > + WRITE_ONCE(msk->snd_una, subflow->idsn); > if (likely(!__mptcp_check_fallback(msk))) > MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVE); Thanks Paolo, LGTM: Reviewed-by: Mat Martineau <martineau@kernel.org>
Hi Paolo, Mat, On 04/06/2024 17:12, Paolo Abeni wrote: > This is strictly related to commit fb7a0d334894 ("mptcp: ensure snd_nxt > is properly initialized on connect"). It turns out that syzkaller can > trigger the retransmit after fallback and before processing any other > incoming packet - so that snd_una is still left uninitialized. > > Address the issue explicitly initializing snd_una together with snd_nxt > and write_seq. Thank you for the patch and the review! Now in our tree (fixes for -net): New patches for t/upstream-net and t/upstream: - cb8305364a4e: mptcp: ensure snd_una is properly initialized on connect - Results: 6a73724ecdb9..1445e7997ac5 (export-net) - Results: 4b2b4ad31b2f..62017f8a5840 (export) Tests are now in progress: - export-net: https://github.com/multipath-tcp/mptcp_net-next/commit/8fb2c487a1ff37b885f724482fc82d85608b7ab5/checks - export: https://github.com/multipath-tcp/mptcp_net-next/commit/8aa3bd2d65c8827d0f8907d8dfb8e5623d15c346/checks Cheers, Matt
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2f8f32cd31d3..1c5b7796daaf 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3735,6 +3735,7 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) WRITE_ONCE(msk->write_seq, subflow->idsn); WRITE_ONCE(msk->snd_nxt, subflow->idsn); + WRITE_ONCE(msk->snd_una, subflow->idsn); if (likely(!__mptcp_check_fallback(msk))) MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVE);
This is strictly related to commit fb7a0d334894 ("mptcp: ensure snd_nxt is properly initialized on connect"). It turns out that syzkaller can trigger the retransmit after fallback and before processing any other incoming packet - so that snd_una is still left uninitialized. Address the issue explicitly initializing snd_una together with snd_nxt and write_seq. Suggested-by: Mat Martineau <martineau@kernel.org> Fixes: 8fd738049ac3 ("mptcp: fallback in case of simultaneous connect") Cc: stable@vger.kernel.org Reported-by: Christoph Paasch <cpaasch@apple.com> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/485 Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/protocol.c | 1 + 1 file changed, 1 insertion(+)