Commit 509d2cd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7f52bb9d 2749749a

security/smack/smackfs.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, 
	}

	if (rc >= 0) {

		old_cat = skp->smk_netlabel.attr.mls.cat;

		skp->smk_netlabel.attr.mls.cat = ncats.attr.mls.cat;

		rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat);

		skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;

		synchronize_rcu();

		netlbl_catmap_free(old_cat);

security/smack/smack_netfilter.c

+2 −2

File changed.

Contains only whitespace changes.