Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb5c94e authored by Patrick Caulfield's avatar Patrick Caulfield Committed by David S. Miller
Browse files

[DECNET]: fix SIGPIPE 



Currently recvmsg generates SIGPIPE whereas sendmsg does not; for the
other stacks it seems to be the other way round!

It also fixes the bug where reading from a socket whose peer has shutdown
returned -EINVAL rather than 0.

Signed-off-by: default avatarPatrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 388f7ef7

net/decnet/af_decnet.c

+7 −7
Original line number Diff line number Diff line
@@ -1664,17 +1664,15 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock, 
		goto out;

	}



	rv = dn_check_state(sk, NULL, 0, &timeo, flags);

	if (rv)

		goto out;



	if (sk->sk_shutdown & RCV_SHUTDOWN) {

		if (!(flags & MSG_NOSIGNAL))

			send_sig(SIGPIPE, current, 0);

		rv = -EPIPE;

		rv = 0;

		goto out;

	}



	rv = dn_check_state(sk, NULL, 0, &timeo, flags);

	if (rv)

		goto out;



	if (flags & ~(MSG_PEEK|MSG_OOB|MSG_WAITALL|MSG_DONTWAIT|MSG_NOSIGNAL)) {

		rv = -EOPNOTSUPP;

		goto out;
@@ -1928,6 +1926,8 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock, 


	if (sk->sk_shutdown & SEND_SHUTDOWN) {

		err = -EPIPE;

		if (!(flags & MSG_NOSIGNAL))

			send_sig(SIGPIPE, current, 0);

		goto out_err;

	}