From: David S. Miller Date: Tue, 7 Jun 2016 22:10:16 +0000 (-0700) Subject: Merge branch 'rds-packet-assembly-fixes' X-Git-Tag: v6.6-pxa1908~18812^2~26 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=29a36611e9f10f629b4d7920418fcb8f5e50ae75;p=linux.git Merge branch 'rds-packet-assembly-fixes' Sowmini Varadhan says: ==================== RDS: TCP: socket locking RDS packet assembly fixes This three part patchset fixes bugs in synchronization between rds_tcp_accept_one() and the rds-tcp send/recv path. Patch 1 ensures that the lock_sock() is taken appropriately and the RDS datagram reassembly state is reset to synchronize with the receive path. Patch 2 ensures that partially sent RDS datagrams will get retransmitted after rds_tcp_accept_one() switches sockets. Patch 3 fixes a race window which would prematurely re-enable rds_send_xmit() before the rds_tcp_connection setup has been completed in rds_tcp_accept_one(). ==================== Signed-off-by: David S. Miller --- 29a36611e9f10f629b4d7920418fcb8f5e50ae75