Merge branch 'mptcp-Fix-for-32-bit-DATA_FIN'

Browse source

Mat Martineau says:

====================
mptcp: Fix for 32-bit DATA_FIN

The main fix is contained in patch 2, and that commit message explains
the issue with not properly converting truncated DATA_FIN sequence
numbers sent by the peer.

With patch 2 adding an unlocked read of msk->ack_seq, patch 1 cleans up
access to that data with READ_ONCE/WRITE_ONCE.

This does introduce two merge conflicts with net-next, but both have
straightforward resolution. Patch 1 modifies a line that got removed in
net-next so the modification can be dropped when merging. Patch 2 will
require a trivial conflict resolution for a modified function
declaration.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-09-29 18:16:09 -07:00

parent 4972c6ccf9 1a49b2c2a5

commit 2b3e981a94

4 changed files with 24 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

net/mptcp/options.c

View file

8

net/mptcp/protocol.c

View file

2

net/mptcp/protocol.h

View file

16

net/mptcp/subflow.c

View file