From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Paolo Abeni <pabeni@redhat.com>, Paul Moore <paul@paul-moore.com>,
selinux@vger.kernel.org, netdev@vger.kernel.org,
Tom Deseyn <tdeseyn@redhat.com>,
Richard Haines <richard_c_haines@btinternet.com>
Subject: Re: [PATCH net] selinux: do not report error on connect(AF_UNSPEC)
Date: Wed, 8 May 2019 15:27:37 -0300 [thread overview]
Message-ID: <20190508182737.GK10916@localhost.localdomain> (raw)
In-Reply-To: <83b4adb4-9d8f-848f-d1cc-a4a1f30cee51@tycho.nsa.gov>
On Wed, May 08, 2019 at 02:13:17PM -0400, Stephen Smalley wrote:
> On 5/8/19 2:12 PM, Stephen Smalley wrote:
> > On 5/8/19 9:32 AM, Paolo Abeni wrote:
> > > calling connect(AF_UNSPEC) on an already connected TCP socket is an
> > > established way to disconnect() such socket. After commit 68741a8adab9
> > > ("selinux: Fix ltp test connect-syscall failure") it no longer works
> > > and, in the above scenario connect() fails with EAFNOSUPPORT.
> > >
> > > Fix the above falling back to the generic/old code when the address
> > > family
> > > is not AF_INET{4,6}, but leave the SCTP code path untouched, as it has
> > > specific constraints.
> > >
> > > Fixes: 68741a8adab9 ("selinux: Fix ltp test connect-syscall failure")
> > > Reported-by: Tom Deseyn <tdeseyn@redhat.com>
> > > Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> > > ---
> > > security/selinux/hooks.c | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> > > index c61787b15f27..d82b87c16b0a 100644
> > > --- a/security/selinux/hooks.c
> > > +++ b/security/selinux/hooks.c
> > > @@ -4649,7 +4649,7 @@ static int
> > > selinux_socket_connect_helper(struct socket *sock,
> > > struct lsm_network_audit net = {0,};
> > > struct sockaddr_in *addr4 = NULL;
> > > struct sockaddr_in6 *addr6 = NULL;
> > > - unsigned short snum;
> > > + unsigned short snum = 0;
> > > u32 sid, perm;
> > > /* sctp_connectx(3) calls via selinux_sctp_bind_connect()
> > > @@ -4674,12 +4674,12 @@ static int
> > > selinux_socket_connect_helper(struct socket *sock,
> > > break;
> > > default:
> > > /* Note that SCTP services expect -EINVAL, whereas
> > > - * others expect -EAFNOSUPPORT.
> > > + * others must handle this at the protocol level:
> > > + * connect(AF_UNSPEC) on a connected socket is
> > > + * a documented way disconnect the socket.
> > > */
> > > if (sksec->sclass == SECCLASS_SCTP_SOCKET)
> > > return -EINVAL;
> > > - else
> > > - return -EAFNOSUPPORT;
> >
> > I think we need to return 0 here. Otherwise, we'll fall through with an
> > uninitialized snum, triggering a random/bogus permission check.
>
> Sorry, I see that you initialize snum above. Nonetheless, I think the
> correct behavior here is to skip the check since this is a disconnect, not a
> connect.
Skipping the check would make it less controllable. So should it
somehow re-use shutdown() stuff? It gets very confusing, and after
all, it still is, in essence, a connect() syscall.
>
> >
> > > }
> > > err = sel_netport_sid(sk->sk_protocol, snum, &sid);
> > >
> >
>
next prev parent reply other threads:[~2019-05-08 18:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 13:32 [PATCH net] selinux: do not report error on connect(AF_UNSPEC) Paolo Abeni
2019-05-08 13:50 ` Marcelo Ricardo Leitner
2019-05-08 16:46 ` David Miller
2019-05-08 18:12 ` Stephen Smalley
2019-05-08 18:13 ` Stephen Smalley
2019-05-08 18:27 ` Marcelo Ricardo Leitner [this message]
2019-05-08 18:51 ` Stephen Smalley
2019-05-08 21:17 ` Paul Moore
2019-05-09 8:40 ` Paolo Abeni
2019-05-09 13:17 ` Paul Moore
2019-05-09 16:33 ` 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=20190508182737.GK10916@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paul@paul-moore.com \
--cc=richard_c_haines@btinternet.com \
--cc=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
--cc=tdeseyn@redhat.com \
/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).