Skip to content

Commit

Permalink
mptcp: implement MSG_TRUNC support
Browse files Browse the repository at this point in the history
The mentioned flag is currently silenlty ignored. This
change implements the TCP-like behaviour, dropping the
pending data up to the specified length.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Paolo Abeni authored and jenkins-tessares committed Apr 19, 2021
1 parent cfb4052 commit 5531020
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions net/mptcp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@ static void mptcp_wait_data(struct sock *sk, long *timeo)

static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
struct msghdr *msg,
size_t len)
size_t len, int flags)
{
struct sk_buff *skb;
int copied = 0;
Expand All @@ -1750,11 +1750,13 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
u32 count = min_t(size_t, len - copied, data_len);
int err;

err = skb_copy_datagram_msg(skb, offset, msg, count);
if (unlikely(err < 0)) {
if (!copied)
return err;
break;
if (!(flags & MSG_TRUNC)) {
err = skb_copy_datagram_msg(skb, offset, msg, count);
if (unlikely(err < 0)) {
if (!copied)
return err;
break;
}
}

copied += count;
Expand Down Expand Up @@ -1966,7 +1968,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
while (copied < len) {
int bytes_read;

bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied);
bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags);
if (unlikely(bytes_read < 0)) {
if (!copied)
copied = bytes_read;
Expand Down

0 comments on commit 5531020

Please sign in to comment.