Skip to content

Commit

Permalink
[DECNET]: fix SIGPIPE
Browse files Browse the repository at this point in the history
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: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick Caulfield authored and David S. Miller committed Nov 11, 2005
1 parent 388f7ef commit 9eb5c94
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/decnet/af_decnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 9eb5c94

Please sign in to comment.