tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2024-09-19 13:09:19 +02:00
parent 7f52bb9de5 2749749afa
commit 509d2cd12a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/smack/smack_netfilter.c
+2 -2
View File
@@ -19,8 +19,8 @@
#include "smack.h" #include "smack.h"
static unsigned int smack_ip_output(void *priv, static unsigned int smack_ip_output(void *priv,
struct sk_buff *skb, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
struct sock *sk = skb_to_full_sk(skb); struct sock *sk = skb_to_full_sk(skb);
struct socket_smack *ssp; struct socket_smack *ssp;
security/smack/smackfs.c
+1 -1
View File
@@ -932,7 +932,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf,
} }
if (rc >= 0) { if (rc >= 0) {
old_cat = skp->smk_netlabel.attr.mls.cat; 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; skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;
synchronize_rcu(); synchronize_rcu();
netlbl_catmap_free(old_cat); netlbl_catmap_free(old_cat);