Merge tag 'Smack-for-6.12' of https://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "Two patches: one is a simple indentation correction, the other
  corrects a potentially rcu unsafe pointer assignment"

* tag 'Smack-for-6.12' of https://github.com/cschaufler/smack-next:
  smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso
  security: smack: Fix indentation in smack_netfilter.c

diff --combined security/smack/smack_netfilter.c
index bad71b7e648da7b57392cac041de34e4c2643412,709b1fcff514e38c0ca793f7fcde54c8d3d5b1f1..8fd747b3653acb7994d70f5754b9aa6679da05df
--- 1/security/smack/smack_netfilter.c
--- 2/security/smack/smack_netfilter.c
+++ b/security/smack/smack_netfilter.c
@@@ -19,15 -19,15 +19,15 @@@
  #include "smack.h"
  
  static unsigned int smack_ip_output(void *priv,
-                                       struct sk_buff *skb,
-                                       const struct nf_hook_state *state)
+                                   struct sk_buff *skb,
+                                   const struct nf_hook_state *state)
  {
        struct sock *sk = skb_to_full_sk(skb);
        struct socket_smack *ssp;
        struct smack_known *skp;
  
 -      if (sk && sk->sk_security) {
 -              ssp = sk->sk_security;
 +      if (sk) {
 +              ssp = smack_sock(sk);
                skp = ssp->smk_out;
                skb->secmark = skp->smk_secid;
        }