Skip to content

Commit 9233a88

Browse files
edumazetgregkh
authored andcommitted
sctp: support MSG_ERRQUEUE flag in recvmsg()
[ Upstream commit 4746b36 ] For some reason sctp_poll() generates EPOLLERR if sk->sk_error_queue is not empty but recvmsg() can not drain the error queue yet. This is needed to better support timestamping. I had to export inet_recv_error(), since sctp can be compiled as a module. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Cc: Willem de Bruijn <willemb@google.com> Acked-by: Xin Long <lucien.xin@gmail.com> Link: https://lore.kernel.org/r/20231212145550.3872051-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of: a562c0a ("sctp: fix busy polling") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 3c0bd2b commit 9233a88

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

net/ipv4/af_inet.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
16421642
#endif
16431643
return -EINVAL;
16441644
}
1645+
EXPORT_SYMBOL(inet_recv_error);
16451646

16461647
int inet_gro_complete(struct sk_buff *skb, int nhoff)
16471648
{

net/sctp/socket.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,9 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
20982098
pr_debug("%s: sk:%p, msghdr:%p, len:%zd, flags:0x%x, addr_len:%p)\n",
20992099
__func__, sk, msg, len, flags, addr_len);
21002100

2101+
if (unlikely(flags & MSG_ERRQUEUE))
2102+
return inet_recv_error(sk, msg, len, addr_len);
2103+
21012104
lock_sock(sk);
21022105

21032106
if (sctp_style(sk, TCP) && !sctp_sstate(sk, ESTABLISHED) &&

0 commit comments

Comments
 (0)