Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d95590 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

dccp: support for passing MSG_TRUNC 



DCCP is datagram-oriented but lacks UDP's support for MSG_TRUNC as defined in
recvmsg(2)/recv(2). Hence the following 'Hello world\0' receiver

  len = recv(fd, buf, 10, MSG_PEEK | MSG_TRUNC);

wrongly (always) returns 10, while in UDP it returns 12 as expected.
This patch adds the missing MSG_TRUNC support to recvmsg().

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfc0861b

net/dccp/proto.c

+2 −0
Original line number Diff line number Diff line
@@ -835,6 +835,8 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
			len = -EFAULT;

			break;

		}

		if (flags & MSG_TRUNC)

			len = skb->len;

	found_fin_ok:

		if (!(flags & MSG_PEEK))

			sk_eat_skb(sk, skb, 0);