| Message ID | 20230419-upstream-lsm-next-20230419-mptcp-sublows-user-ctx-v1-2-9d4064cb0075@tessares.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | security: SELinux/LSM label with MPTCP and accept | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, Apr 19, 2023 at 1:44 PM Matthieu Baerts <matthieu.baerts@tessares.net> wrote: > From: Paolo Abeni <pabeni@redhat.com> > > Newly added subflows should inherit the LSM label from the associated > msk socket regarless current context. "... from the associated main MPTCP socket regardless of the current context." Us SELinux folks may not always be able to make the jump from "msk" to "main MPTCP socket" when we are looking through the git log in the future, let's make it easier on us/me ;) > This patch implements the above copying sid and class from the msk > context, deleting the existing subflow label, if any, and then "... from the main MPTCP socket context, deleting ..." > re-creating a new one. > > The new helper reuses the selinux_netlbl_sk_security_free() function, > and the latter can end-up being called multiple times with the same > argument; we additionally need to make it idempotent. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > --- > security/selinux/hooks.c | 16 ++++++++++++++++ > security/selinux/netlabel.c | 8 ++++++-- > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 9a5bdfc21314..53cfc1cb67d2 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -5476,6 +5476,21 @@ static void selinux_sctp_sk_clone(struct sctp_association *asoc, struct sock *sk > selinux_netlbl_sctp_sk_clone(sk, newsk); > } > > +static int selinux_mptcp_add_subflow(struct sock *sk, struct sock *ssk) > +{ > + struct sk_security_struct *ssksec = ssk->sk_security; > + struct sk_security_struct *sksec = sk->sk_security; > + > + ssksec->sclass = sksec->sclass; > + ssksec->sid = sksec->sid; > + > + /* replace the existing subflow label deleting the existing one > + * and re-recrating a new label using the current context "... new label using the updated context" Let's avoid the phrase "current context" as that could imply the current task, which is exactly what we are trying not to do. > + */ > + selinux_netlbl_sk_security_free(ssksec); > + return selinux_netlbl_socket_post_create(ssk, ssk->sk_family); > +} > + -- paul-moore.com
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 9a5bdfc21314..53cfc1cb67d2 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5476,6 +5476,21 @@ static void selinux_sctp_sk_clone(struct sctp_association *asoc, struct sock *sk selinux_netlbl_sctp_sk_clone(sk, newsk); } +static int selinux_mptcp_add_subflow(struct sock *sk, struct sock *ssk) +{ + struct sk_security_struct *ssksec = ssk->sk_security; + struct sk_security_struct *sksec = sk->sk_security; + + ssksec->sclass = sksec->sclass; + ssksec->sid = sksec->sid; + + /* replace the existing subflow label deleting the existing one + * and re-recrating a new label using the current context + */ + selinux_netlbl_sk_security_free(ssksec); + return selinux_netlbl_socket_post_create(ssk, ssk->sk_family); +} + static int selinux_inet_conn_request(const struct sock *sk, struct sk_buff *skb, struct request_sock *req) { @@ -7216,6 +7231,7 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(sctp_sk_clone, selinux_sctp_sk_clone), LSM_HOOK_INIT(sctp_bind_connect, selinux_sctp_bind_connect), LSM_HOOK_INIT(sctp_assoc_established, selinux_sctp_assoc_established), + LSM_HOOK_INIT(mptcp_add_subflow, selinux_mptcp_add_subflow), LSM_HOOK_INIT(inet_conn_request, selinux_inet_conn_request), LSM_HOOK_INIT(inet_csk_clone, selinux_inet_csk_clone), LSM_HOOK_INIT(inet_conn_established, selinux_inet_conn_established), diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index 1321f15799e2..33187e38def7 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c @@ -155,8 +155,12 @@ void selinux_netlbl_err(struct sk_buff *skb, u16 family, int error, int gateway) */ void selinux_netlbl_sk_security_free(struct sk_security_struct *sksec) { - if (sksec->nlbl_secattr != NULL) - netlbl_secattr_free(sksec->nlbl_secattr); + if (!sksec->nlbl_secattr) + return; + + netlbl_secattr_free(sksec->nlbl_secattr); + sksec->nlbl_secattr = NULL; + sksec->nlbl_state = NLBL_UNSET; } /**