Skip to contentSkip to conversation

convert smack_netlbladdrs to standard list

RFC PATCH New etienne 1 participant 1 message Feb 21, 2009

Subsystems (2)
lore
Share & tools
lore

etienne

author
#0 lore raw

RFC PATCH 1/1 convert smack_netlbladdrs to standard list

Casey, Paul,

please find below my first (working) try to convert smack_netlbladdrs to standard list (patch on top of .29rc5 + my previous patch)
I tested it and found no regression, no hangs etc...

Please have a more detailed look at the seq_files changes, they were not so trivial to convert
I heavily tested the sorted insert in userspace before ever thinking of doing it in the kernel, so this should be fine :)

Small possible improvements, what do you think :
- create a #define for_each_smk_netlbladdr(__smk) list_for_each_entry(__smk, &smk_netlbladdr_list, list)
- create a #define list2smk_netlbladdr(__l) container_of(__l, struct smk_netlbladdr, list); (better name required!)

have a nice week-end,
Etienne

Signed-off-by <[email protected]>

---

security/smack/smack.h +7 -3
index b79582e..0b21ccd 100644
@@ -18,7 +18,7 @@
 #include <linux/security.h>
 #include <linux/in.h>
 #include <net/netlabel.h>
-
+#include <linux/list.h>
 /*
  * Why 23? CIPSO is constrained to 30, so a 32 byte buffer is
  * bigger than can be used, and 24 is the next lower multiple
@@ -69,6 +69,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 +86,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 +114,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 +217,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 +1 -2
index e7ded13..0546ad8 100644
@@ -1509,8 +1509,7 @@ 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) {
+	list_for_each_entry(snp, &smk_netlbladdr_list, list) {
 		/*
 		 * we break after finding the first match because
 		 * the list is sorted from longest to shortest mask
security/smack/smackfs.c +45 -33

127 lines not on this page · raw message