Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-3
+2
-2
security/smack/smack_netfilter.c
+2
-2
security/smack/smack_netfilter.c
···
19
19
#include "smack.h"
20
20
21
21
static unsigned int smack_ip_output(void *priv,
22
-
struct sk_buff *skb,
23
-
const struct nf_hook_state *state)
22
+
struct sk_buff *skb,
23
+
const struct nf_hook_state *state)
24
24
{
25
25
struct sock *sk = skb_to_full_sk(skb);
26
26
struct socket_smack *ssp;
+1
-1
security/smack/smackfs.c
+1
-1
security/smack/smackfs.c
···
932
932
}
933
933
if (rc >= 0) {
934
934
old_cat = skp->smk_netlabel.attr.mls.cat;
935
-
skp->smk_netlabel.attr.mls.cat = ncats.attr.mls.cat;
935
+
rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat);
936
936
skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;
937
937
synchronize_rcu();
938
938
netlbl_catmap_free(old_cat);