From: David Miller <davem@davemloft.net>
To: ebiederm@xmission.com
Cc: netdev@vger.kernel.org, xemul@openvz.org, dan@aloni.org,
stable@kernel.org
Subject: Re: [PATCH] af_unix: Only allow recv on connected seqpacket sockets.
Date: Sun, 24 Apr 2011 12:05:19 -0700 (PDT) [thread overview]
Message-ID: <20110424.120519.226767465.davem@davemloft.net> (raw)
In-Reply-To: <m1sjt7sw32.fsf_-_@fess.ebiederm.org>
From: ebiederm@xmission.com (Eric W. Biederman)
Date: Sun, 24 Apr 2011 04:54:57 -0700
> +static int unix_seqpacket_recvmsg(struct kiocb *iocb, struct socket *sock,
> + struct msghdr *msg, size_t size,
> + int flags)
> +{
> + struct sock *sk = sock->sk;
> +
> + if (sk->sk_state != TCP_ESTABLISHED)
> + return -ENOTCONN;
As for unix_seqpacket_sendmsg(), you need to add a check for sock_error()
or similar here otherwise -ECONNRESET is not reported correctly.
In fact, recvmsg() is even harder than sendmsg() to handle correctly,
because we have to also properly report EOF on seqpacket sockets which
have RCV_SHUTDOWN set.
So a lot more work has to go into this change to make it fix the bug
without also breaking existing semantics.
Anyways, see:
commit 6e14891f4d16f8a9e0bc3a8408f73b3aed93ab0a
Author: James Morris <jmorris@redhat.com>
Date: Fri Nov 19 07:02:41 2004 -0800
[AF_UNIX]: Don't lose ECONNRESET in unix_seqpacket_sendmsg()
The fix for SELinux w/SOCK_SEQPACKET had an error,
noted by Alan Cox. This fixes it.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 16faa9d..8902c4a 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1513,13 +1513,18 @@ out_err:
static int unix_seqpacket_sendmsg(struct kiocb *kiocb, struct socket *sock,
struct msghdr *msg, size_t len)
{
+ int err;
struct sock *sk = sock->sk;
+ err = sock_error(sk);
+ if (err)
+ return err;
+
if (sk->sk_state != TCP_ESTABLISHED)
return -ENOTCONN;
- if (msg->msg_name || msg->msg_namelen)
- return -EINVAL;
+ if (msg->msg_namelen)
+ msg->msg_namelen = 0;
return unix_dgram_sendmsg(kiocb, sock, msg, len);
}
next prev parent reply other threads:[~2011-04-24 19:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <BANLkTi=zSJAXYa8Vo8rZKgs9C-AfbjjEpA@mail.gmail.com>
[not found] ` <m1zkngse02.fsf@fess.ebiederm.org>
[not found] ` <BANLkTimrOs2T_bnbSJDgppAAh_MUWt_erg@mail.gmail.com>
2011-04-24 11:54 ` [PATCH] af_unix: Only allow recv on connected seqpacket sockets Eric W. Biederman
2011-04-24 19:05 ` David Miller [this message]
2011-04-25 14:26 ` Eric W. Biederman
2011-05-02 6:16 ` David 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=20110424.120519.226767465.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=dan@aloni.org \
--cc=ebiederm@xmission.com \
--cc=netdev@vger.kernel.org \
--cc=stable@kernel.org \
--cc=xemul@openvz.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;
as well as URLs for NNTP newsgroup(s).