]> git.ipfire.org Git - thirdparty/kernel/stable.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 14:43:16 +0000 (16:43 +0200)
commit259da0c137f6b02df530c6d072fce0a6f8cc4814
tree556e2680ebff0ef39e65c7bbb62c00feb88a6a89
parent4463a6bc4e728b9c8466da42aa8bdde28980060d
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/ar-output.c
net/rxrpc/ar-recvmsg.c