]> git.ipfire.org Git - people/arne_f/kernel.git/commit
rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA
authorDavid Howells <dhowells@redhat.com>
Mon, 20 Jul 2020 11:41:46 +0000 (12:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2020 16:47:15 +0000 (18:47 +0200)
commit840cbbea7774cb0efce3d20af19257b95c60bc7e
tree39cb3b7b8e5b744b2b10469678249e8261b7874b
parent4863a13cf454b759ea01e5025ec27dab3d5f8a70
rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA

[ Upstream commit 639f181f0ee20d3249dbc55f740f0167267180f0 ]

rxrpc_sendmsg() returns EPIPE if there's an outstanding error, such as if
rxrpc_recvmsg() indicating ENODATA if there's nothing for it to read.

Change rxrpc_recvmsg() to return EAGAIN instead if there's nothing to read
as this particular error doesn't get stored in ->sk_err by the networking
core.

Also change rxrpc_sendmsg() so that it doesn't fail with delayed receive
errors (there's no way for it to report which call, if any, the error was
caused by).

Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/rxrpc/recvmsg.c
net/rxrpc/sendmsg.c