mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Patrick Caulfield <patrick@tykepenguin.com>
To: davem@davemloft.net
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] DECnet fix SIGPIPE
Date: Fri, 11 Nov 2005 13:35:47 +0000	[thread overview]
Message-ID: <20051111133547.GA28775@tykepenguin.com> (raw)

This patch fixes SIGIPIPE for DECnet. 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>

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1664,17 +1664,15 @@ static int dn_recvmsg(struct kiocb *iocb
 		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
 
 	if (sk->sk_shutdown & SEND_SHUTDOWN) {
 		err = -EPIPE;
+		if (!(flags & MSG_NOSIGNAL))
+			send_sig(SIGPIPE, current, 0);
 		goto out_err;
 	}
 


             reply	other threads:[~2005-11-11 13:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-11 13:35 Patrick Caulfield [this message]
2005-11-11 20:04 ` David S. Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20051111133547.GA28775@tykepenguin.com \
    --to=patrick@tykepenguin.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome