On Thu, 2022-12-01 at 21:06 -0500, Paul Moore wrote:
> > > Any ideas, suggestions, or patches welcome!
> >
> > I think something alike the following could work - not even tested,
> > with comments on bold assumptions.
> >
> > I'll try to do some testing later.
> >
> > ---
> > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> > index 99f5e51d5ca4..6cad50c6fd24 100644
> > --- a/net/mptcp/protocol.c
> > +++ b/net/mptcp/protocol.c
> > @@ -102,6 +102,20 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)
> > if (err)
> > return err;
> >
> > + /* The first subflow can later be indirectly exposed to security
> > + * relevant syscall alike accept() and bind(), and at this point
> > + * carries a 'kern' related security context.
> > + * Reset the security context to the relevant user-space one.
> > + * Note that the following assumes security_socket_post_create()
> > + * being idempotent
> > + */
> > + err = security_socket_post_create(ssock, sk->sk_family, SOCK_STREAM,
> > + IPPROTO_TCP, 0);
> > + if (err) {
> > + sock_release(ssock);
> > + return err;
> > + }
>
> I'm not sure we want to start calling security_socket_post_create()
> twice on a given socket, *maybe* it works okay now but that seems like
> an awkward constraint to put on future LSMs (or changes to existing
> ones). If we decide that the best approach is to add a LSM hook call
> here, we should create a new hook instead of reusing an existing one;
> I think this falls under Ondrej's possible solution #2.
I agree the above code is not very nice and an additional selinux hook
would be much cleaner. I tried the above path as a possible quick
fixup. AFAICS all the existing selinux modules implement the
socket_post_create() hook in such a way that calling it on an already
initialized socket yeld to the desidered result.
I agree putting additional, currently non exiting, constraint on
existing hooks is definitelly not nice.
>
> However, I think this simplest solution might be what I mentioned
> above as #2a, simply labeling the subflow socket properly from the
> beginning. In the case of SELinux I think we could do that by simply
> clearing the @kern flag in the case of IPPROTO_MPTCP; completely
> untested (and likely whitespace mangled) hack shown below:
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index f553c370397e..de6aa80b2319 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -4562,6 +4562,7 @@ static int selinux_socket_create(int family, int type,
> u16 secclass;
> int rc;
>
> + kern = (protocol == IPPROTO_MPTCP ? 0 : kern);
> if (kern)
> return 0;
>
> @@ -4584,6 +4585,7 @@ static int selinux_socket_post_create(struct
> socket *sock, int family,
> u32 sid = SECINITSID_KERNEL;
> int err = 0;
>
> + kern = (protocol == IPPROTO_MPTCP ? 0 : kern);
> if (!kern) {
> err = socket_sockcreate_sid(tsec, sclass, &sid);
> if (err)
>
> ... of course the downside is that this is not a general cross-LSM
> solution, but those are very hard, if not impossible, to create as the
> individual LSMs can vary tremendously. There is also the downside of
> having to have a protocol specific hack in the LSM socket creation
> hooks, which is a bit of a bummer, but then again we already have to
> do so much worse elsewhere in the LSM networking hooks that this is
> far from the worst thing we've had to do.
There is a problem with the above: the relevant/affected socket is an
MPTCP subflow, which is actually a TCP socket (protocol ==
IPPROTO_TCP). Yep, MPTCP is quite a mes... complex.
I think we can't follow this later path.
If even the initially proposed hack is a no-go, another option could
possibly be the following - that is: do not touch the subflows, and try
to initilize the accepted msk context correctly.
Note that the relevant context does not held the 'sk' socket lock, nor
it could acquire it, but at least 'sk' can't be freed under the hood
and there are exiting places e.g. the unix socket accept() where
security_sock_graft() is invoked with similar (lack of) locking.
Side note: I'm confused by the selinux_sock_graft() implementation:
https://elixir.bootlin.com/linux/v6.1-rc7/source/security/selinux/hooks.c#L5243
it looks like the 'sid' is copied from the 'child' socket into the
'parent', while the sclass from the 'parent' into the 'child'. Am I
misreading it? is that intended? I would have expeted both 'sid' and
'sclass' being copied from the parent into the child. Other LSM's
sock_graft() initilize the child and leave alone the parent.
---
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 99f5e51d5ca4..b8095b8df71d 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3085,7 +3085,10 @@ struct sock *mptcp_sk_clone(const struct sock *sk,
/* will be fully established after successful MPC subflow creation */
inet_sk_state_store(nsk, TCP_SYN_RECV);
- security_inet_csk_clone(nsk, req);
+ /* let's the new socket inherit the security label from the msk
+ * listener, as the TCP reqest socket carries a kernel context
+ */
+ security_sock_graft(nsk, sk->sk_socket);
bh_unlock_sock(nsk);
/* keep a single reference */
