diff options
| author | David Howells <dhowells@redhat.com> | 2020-07-20 13:41:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-21 02:47:10 +0200 |
| commit | 639f181f0ee20d3249dbc55f740f0167267180f0 (patch) | |
| tree | db0d374cdf4d772cb453f64580dcc640ec4f6885 /net/rxrpc/sendmsg.c | |
| parent | Merge tag 'ieee802154-for-davem-2020-07-20' of git://git.kernel.org/pub/scm/l... (diff) | |
| download | linux-639f181f0ee20d3249dbc55f740f0167267180f0.tar.xz linux-639f181f0ee20d3249dbc55f740f0167267180f0.zip | |
rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA
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>
Diffstat (limited to '')
| -rw-r--r-- | net/rxrpc/sendmsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c index 1304b8608f56..03a30d014bb6 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -304,7 +304,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, /* this should be in poll */ sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk); - if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) + if (sk->sk_shutdown & SEND_SHUTDOWN) return -EPIPE; more = msg->msg_flags & MSG_MORE; |