SMACK: Add sk_clone_security LSM hook
authorLontke Michael <michael.lontke@elektrobit.com>
Wed, 31 Aug 2022 12:03:26 +0000 (14:03 +0200)
committerCasey Schaufler <casey@schaufler-ca.com>
Tue, 27 Sep 2022 17:33:03 +0000 (10:33 -0700)
Using smk_of_current() during sk_alloc_security hook leads in
rare cases to a faulty initialization of the security context
of the created socket.

By adding the LSM hook sk_clone_security to SMACK this initialization
fault is corrected by copying the security context of the old socket
pointer to the newly cloned one.

Co-authored-by: Martin Ostertag: <martin.ostertag@elektrobit.com>
Signed-off-by: Lontke Michael <michael.lontke@elektrobit.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
security/smack/smack_lsm.c

index 0018314..077bf6f 100644 (file)
@@ -2279,6 +2279,21 @@ static void smack_sk_free_security(struct sock *sk)
 }
 
 /**
+ * smack_sk_clone_security - Copy security context
+ * @sk: the old socket
+ * @newsk: the new socket
+ *
+ * Copy the security context of the old socket pointer to the cloned
+ */
+static void smack_sk_clone_security(const struct sock *sk, struct sock *newsk)
+{
+       struct socket_smack *ssp_old = sk->sk_security;
+       struct socket_smack *ssp_new = newsk->sk_security;
+
+       *ssp_new = *ssp_old;
+}
+
+/**
 * smack_ipv4host_label - check host based restrictions
 * @sip: the object end
 *
@@ -4851,6 +4866,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(socket_getpeersec_dgram, smack_socket_getpeersec_dgram),
        LSM_HOOK_INIT(sk_alloc_security, smack_sk_alloc_security),
        LSM_HOOK_INIT(sk_free_security, smack_sk_free_security),
+       LSM_HOOK_INIT(sk_clone_security, smack_sk_clone_security),
        LSM_HOOK_INIT(sock_graft, smack_sock_graft),
        LSM_HOOK_INIT(inet_conn_request, smack_inet_conn_request),
        LSM_HOOK_INIT(inet_csk_clone, smack_inet_csk_clone),