Commit cb9d80f4 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: implement dummy MSG_ERRQUEUE support 



mptcp_recvmsg() currently silently ignores MSG_ERRQUEUE, returning
input data instead of error cmsg.

This change provides a dummy implementation for MSG_ERRQUEUE - always
returns no data. That is consistent with the current lack of a suitable
IP_RECVERR setsockopt() support.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1ce98c7

net/mptcp/protocol.c

+4 −0
Original line number Diff line number Diff line
@@ -1945,6 +1945,10 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
	int target;

	long timeo;



	/* MSG_ERRQUEUE is really a no-op till we support IP_RECVERR */

	if (unlikely(flags & MSG_ERRQUEUE))

		return inet_recv_error(sk, msg, len, addr_len);



	if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT))

		return -EOPNOTSUPP;