convert smack_netlbladdrs to standard list V2
Subsystems (2)
RFC PATCH 1/1 convert smack_netlbladdrs to standard list V2
hello,
please find below my seond try to convert smack_netlbladdrs to standard list
(patch on top of .29rc5 + [PATCH] SMACK netlabel fixes v2) I tested it and found no regression, no hangs etc...
change since v1 : use rcu variants for list manipulation (thanks Tetsuo Handa a Paul McKenney)
Please let me know if there are problems
Etienne
Signed-off-by <[email protected]>
---
security/smack/smack.h +8 -2
@@ -18,6 +18,8 @@#include <linux/security.h> #include <linux/in.h> #include <net/netlabel.h> +#include <linux/list.h> +#include <linux/rculist.h> /* * Why 23? CIPSO is constrained to 30, so a 32 byte buffer is
@@ -69,6 +71,7 @@ struct smack_rule {*/ struct smk_list_entry {struct smk_list_entry *smk_next; +struct list_head list;struct smack_rule smk_rule; };
@@ -85,7 +88,7 @@ struct smack_cipso {* An entry in the table identifying hosts. */ struct smk_netlbladdr { -struct smk_netlbladdr *smk_next; +struct list_head list;struct sockaddr_in smk_host;/* network address */ struct in_addr smk_mask;/* network mask */ char *smk_label;/* label */
@@ -113,6 +116,7 @@ struct smk_netlbladdr {* the cipso direct mapping in used internally. */ struct smack_known { +struct list_head list;struct smack_known *smk_next;char smk_known[SMK_LABELLEN ];u32 smk_secid;
@@ -215,7 +219,9 @@ extern struct smack_known smack_known_star;extern struct smack_known smack_known_web;extern struct smk_list_entry *smack_list; -extern struct smk_netlbladdr *smack_netlbladdrs; +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_lsm.c +4 -3
@@ -1509,8 +1509,8 @@ static char *smack_host_label(struct sockaddr_in *sip)if (siap->s_addr ==0 )return NULL ; - -for (snp = smack_netlbladdrs; snp !=NULL ; snp = snp->smk_next) { +rcu_read_lock (); +list_for_each_entry_rcu (snp, &smk_netlbladdr_list, list) {/* * we break after finding the first match because * the list is sorted from longest to shortest mask
@@ -1518,10 +1518,11 @@ static char *smack_host_label(struct sockaddr_in *sip)*/ if ((&snp->smk_host.sin_addr)->s_addr == (siap->s_addr & (&snp->smk_mask)->s_addr)) { +rcu_read_unlock ();return snp->smk_label; } } - +rcu_read_unlock ();return NULL ; }
security/smack/smackfs.c +47 -33
132 lines not on this page · raw message