Commit e229c877 authored Jul 16, 2020 by Sabrina Dubroca Committed by Steffen Klassert Jul 17, 2020

espintcp: recv() should return 0 when the peer socket is closed



man 2 recv says:

    RETURN VALUE

    When a stream socket peer has performed an orderly shutdown, the
    return value will be 0 (the traditional "end-of-file" return).

Currently, this works for blocking reads, but non-blocking reads will
return -EAGAIN. This patch overwrites that return value when the peer
won't send us any more data.

Fixes: e27cca96 ("xfrm: add espintcp (RFC 8229)")
Reported-by: Andrew Cagney <cagney@libreswan.org>
Tested-by: Andrew Cagney <cagney@libreswan.org>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent ac1321ef

net/xfrm/espintcp.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -109,8 +109,11 @@ static int espintcp_recvmsg(struct sock sk, struct msghdr msg, size_t len,
		flags \|= nonblock ? MSG_DONTWAIT : 0;

		skb = __skb_recv_datagram(sk, &ctx->ike_queue, flags, &off, &err);
		if (!skb)
		if (!skb) {
		if (err == -EAGAIN && sk->sk_shutdown & RCV_SHUTDOWN)
		return 0;
		return err;
		}

		copied = len;
		if (copied > skb->len)

Admin message