convert smack rule list to linux list V2
Subsystems (2)
PATCH 1/1 convert smack rule list to linux list V2
hello,
This patch convert the smack_list list to standard linux list, struct smk_list_entry is also removed (list_head is added directly in smack_rule, smk_list_entry has no practical use?) this patch applies on top of
[PATCH][SMACK][RFC] convert smack_netlbladdrs to standard list v2
change since V1 : rcu variants
regards
Etienne
Signed-off-by <[email protected]>
---
security/smack/smack.h +4 -12
@@ -61,18 +61,10 @@ struct inode_smack {* A label access rule. */ struct smack_rule { -char *smk_subject; -char *smk_object; -int smk_access; -}; - -/* -* An entry in the table of permitted label accesses. -*/ -struct smk_list_entry { -struct smk_list_entry *smk_next;struct list_head list; -struct smack_rule smk_rule; +char *smk_subject; +char *smk_object; +int smk_access; };/*
@@ -218,10 +210,10 @@ extern struct smack_known smack_known_invalid;extern struct smack_known smack_known_star;extern struct smack_known smack_known_web; -extern struct smk_list_entry *smack_list;extern struct list_head smack_know_list;extern struct list_head smack_rule_list;extern struct list_head smk_netlbladdr_list; +extern struct security_operations smack_ops;/*
security/smack/smack_access.c +3 -4
@@ -87,7 +87,6 @@ static u32 smack_next_secid = 10;int smk_access (char *subject_label,char *object_label,int request) {u32 may =MAY_NOT ; -struct smk_list_entry *sp;struct smack_rule *srp;/*
@@ -139,9 +138,8 @@ int smk_access(char *subject_label, char *object_label, int request)* access (e.g. read is included in readwrite) it's * good. */ -for (sp = smack_list; sp !=NULL ; sp = sp->smk_next) { - srp = &sp->smk_rule; - +rcu_read_lock (); +list_for_each_entry_rcu (srp, &smack_rule_list, list) {if (srp->smk_subject == subject_label ||strcmp (srp->smk_subject, subject_label) ==0 ) { if (srp->smk_object == object_label ||
@@ -151,6 +149,7 @@ int smk_access(char *subject_label, char *object_label, int request) } } } +rcu_read_unlock ();/* * This is a bit map operation. */
security/smack/smackfs.c +50 -47
193 lines not on this page · raw message