Move cipso_free,cipso_new,cipso_apply from utils/common.c to libsmack/libsmack.c

In libsmack/libsmack.c, move smack_cipso-* right after smack-access-*

diff --git a/libsmack/libsmack.c b/libsmack/libsmack.c
index 5bd2b22..adcdf76 100644 (file)
--- a/libsmack/libsmack.c
+++ b/libsmack/libsmack.c
@@ -38,6 +38,15 @@
 #define ACC_LEN 5
 #define LOAD_LEN (2 * (LABEL_LEN + 1) + ACC_LEN)
 
+#define LEVEL_MAX 255
+#define NUM_LEN 4
+#define BUF_SIZE 512
+#define CAT_MAX_COUNT 240
+#define CAT_MAX_VALUE 63
+#define CIPSO_POS(i)   (LABEL_LEN + 1 + NUM_LEN + NUM_LEN + i * NUM_LEN)
+#define CIPSO_MAX_SIZE CIPSO_POS(CAT_MAX_COUNT)
+#define CIPSO_NUM_LEN_STR "%-4d"
+
 #define ACC_R 0x01
 #define ACC_W 0x02
 #define ACC_X 0x04
@@ -62,6 +71,19 @@ struct smack_accesses {
        struct smack_rule *last;
 };
 
+struct cipso_mapping {
+       char label[LABEL_LEN + 1];
+       int cats[CAT_MAX_VALUE];
+       int ncats;
+       int level;
+       struct cipso_mapping *next;
+};
+
+struct smack_cipso {
+       struct cipso_mapping *first;
+       struct cipso_mapping *last;
+};
+
 static int accesses_apply(struct smack_accesses *handle, int clear);
 static inline int access_type_to_int(const char *access_type);
 static inline void int_to_access_type_c(unsigned ac, char *str);
@@ -259,7 +281,142 @@ int smack_have_access(const char *subject, const char *object,
 
        return buf[0] == '1';
 }
+void smack_cipso_free(struct smack_cipso *cipso)
+{
+       if (cipso == NULL)
+               return;
+
+       struct cipso_mapping *mapping = cipso->first;
+       struct cipso_mapping *next_mapping = NULL;
+
+       while (mapping != NULL) {
+               next_mapping = mapping->next;
+               free(mapping);
+               mapping = next_mapping;
+       }
+}
+
+struct smack_cipso *smack_cipso_new(int fd)
+{
+       struct smack_cipso *cipso = NULL;
+       struct cipso_mapping *mapping = NULL;
+       FILE *file = NULL;
+       char buf[BUF_SIZE];
+       char *label, *level, *cat, *ptr;
+       long int val;
+       int i;
+       int newfd;
+
+       newfd = dup(fd);
+       if (newfd == -1)
+               return NULL;
 
+       file = fdopen(newfd, "r");
+       if (file == NULL) {
+               close(newfd);
+               return NULL;
+       }
+
+       cipso = calloc(sizeof(struct smack_cipso ), 1);
+       if (cipso == NULL) {
+               fclose(file);
+               return NULL;
+       }
+
+       while (fgets(buf, BUF_SIZE, file) != NULL) {
+               mapping = calloc(sizeof(struct cipso_mapping), 1);
+               if (mapping == NULL)
+                       goto err_out;
+
+               label = strtok_r(buf, " \t\n", &ptr);
+               level = strtok_r(NULL, " \t\n", &ptr);
+               cat = strtok_r(NULL, " \t\n", &ptr);
+               if (label == NULL || cat == NULL || level == NULL ||
+                   strlen(label) > LABEL_LEN) {
+                       errno = EINVAL;
+                       goto err_out;
+               }
+
+               strcpy(mapping->label, label);
+
+               errno = 0;
+               val = strtol(level, NULL, 10);
+               if (errno)
+                       goto err_out;
+
+               if (val < 0 || val > LEVEL_MAX) {
+                       errno = ERANGE;
+                       goto err_out;
+               }
+
+               mapping->level = val;
+
+               for (i = 0; i < CAT_MAX_COUNT && cat != NULL; i++) {
+                       errno = 0;
+                       val = strtol(cat, NULL, 10);
+                       if (errno)
+                               goto err_out;
+
+                       if (val < 0 || val > CAT_MAX_VALUE) {
+                               errno = ERANGE;
+                               goto err_out;
+                       }
+
+                       mapping->cats[i] = val;
+
+                       cat = strtok_r(NULL, " \t\n", &ptr);
+               }
+
+               mapping->ncats = i;
+
+               if (cipso->first == NULL) {
+                       cipso->first = cipso->last = mapping;
+               } else {
+                       cipso->last->next = mapping;
+                       cipso->last = mapping;
+               }
+       }
+
+       if (ferror(file))
+               goto err_out;
+
+       fclose(file);
+       return cipso;
+err_out:
+       fclose(file);
+       smack_cipso_free(cipso);
+       free(mapping);
+       return NULL;
+}
+
+int smack_cipso_apply(struct smack_cipso *cipso)
+{
+       struct cipso_mapping *m = NULL;
+       char buf[CIPSO_MAX_SIZE];
+       int fd;
+       int i;
+
+       fd = open(SMACKFS_MNT "/cipso2", O_WRONLY);
+       if (fd < 0)
+               return -1;
+
+       for (m = cipso->first; m != NULL; m = m->next) {
+               sprintf(buf, "%s ", m->label);
+               sprintf(&buf[LABEL_LEN + 1], CIPSO_NUM_LEN_STR, m->level);
+               sprintf(&buf[LABEL_LEN + 1 + NUM_LEN], CIPSO_NUM_LEN_STR, m->ncats);
+
+               for (i = 0; i < m->ncats; i++)
+                       sprintf(&buf[CIPSO_POS(i)], CIPSO_NUM_LEN_STR, m->cats[i]);
+
+               if (write(fd, buf, strlen(buf)) < 0) {
+                       close(fd);
+                       return -1;
+               }
+       }
+
+       close(fd);
+       return 0;
+}
 int smack_new_label_from_self(char **label)
 {
        char *result;
@@ -425,3 +582,4 @@ static inline void int_to_access_type_k(unsigned access, char *str)
        str[5] = '\0';
 }
 
+

diff --git a/libsmack/libsmack.sym b/libsmack/libsmack.sym
index c9337b6..ed9da3c 100644 (file)
--- a/libsmack/libsmack.sym
+++ b/libsmack/libsmack.sym
@@ -8,6 +8,9 @@ global:
        smack_accesses_add;
        smack_accesses_add_from_file;
        smack_have_access;
+        smack_cipso_free;
+        smack_cipso_new;
+        smack_cipso_apply;
        smack_new_label_from_self;
        smack_new_label_from_socket;
 local:

diff --git a/libsmack/sys/smack.h b/libsmack/sys/smack.h
index 1549ba0..28cce4e 100644 (file)
--- a/libsmack/sys/smack.h
+++ b/libsmack/sys/smack.h
@@ -36,6 +36,11 @@
  */
 struct smack_accesses;
 
+/*!
+ *
+ */
+struct smack_cipso;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,6 +117,12 @@ int smack_accesses_add_from_file(struct smack_accesses *accesses, int fd);
 int smack_have_access(const char *subject, const char *object,
                      const char *access_type);
 
+struct smack_cipso *smack_cipso_new(int fd);
+
+void smack_cipso_free(struct smack_cipso *cipso);
+
+int smack_cipso_apply(struct smack_cipso *cipso);
+
 /*!
   * Get the label that is associated with the callers process.
   * Caller is responsible of freeing the returned label.
@@ -132,6 +143,7 @@ int smack_new_label_from_self(char **label);
   */
 int smack_new_label_from_socket(int fd, char **label);
 
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/utils/common.c b/utils/common.c
index 776be7b..afa33a4 100644 (file)
--- a/utils/common.c
+++ b/utils/common.c
@@ -36,35 +36,9 @@
 #include <string.h>
 
 #define SMACKFS_MAGIC 0x43415d53
-#define CAT_MAX_COUNT 240
-#define CAT_MAX_VALUE 63
-#define LEVEL_MAX 255
-#define NUM_LEN 4
-
-#define CIPSO_POS(i)   (LABEL_LEN + 1 + NUM_LEN + NUM_LEN + i * NUM_LEN)
-#define CIPSO_MAX_SIZE CIPSO_POS(CAT_MAX_COUNT)
-#define CIPSO_NUM_LEN_STR "%-4d"
-
-#define BUF_SIZE 512
-
-struct cipso_mapping {
-       char label[LABEL_LEN + 1];
-       int cats[CAT_MAX_VALUE];
-       int ncats;
-       int level;
-       struct cipso_mapping *next;
-};
-
-struct cipso {
-       struct cipso_mapping *first;
-       struct cipso_mapping *last;
-};
 
 static int apply_rules_cb(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
 static int apply_cipso_cb(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
-static struct cipso *cipso_new(int fd);
-static void cipso_free(struct cipso *cipso);
-static int cipso_apply(struct cipso *cipso);
 
 int is_smackfs_mounted(void)
 {
@@ -170,15 +144,15 @@ int apply_rules_file(int fd, int clear)
 
 int apply_cipso_file(int fd)
 {
-       struct cipso *cipso = NULL;
+       struct smack_cipso *cipso = NULL;
        int ret;
 
-       cipso = cipso_new(fd);
+       cipso = smack_cipso_new(fd);
        if (cipso == NULL)
                return -1;
 
-       ret = cipso_apply(cipso);
-       cipso_free(cipso);
+       ret = smack_cipso_apply(cipso);
+       smack_cipso_free(cipso);
        if (ret)
                return -1;
 
@@ -222,140 +196,3 @@ static int apply_cipso_cb(const char *fpath, const struct stat *sb, int typeflag
        close(fd);
        return ret;
 }
-
-static struct cipso *cipso_new(int fd)
-{
-       struct cipso *cipso = NULL;
-       struct cipso_mapping *mapping = NULL;
-       FILE *file = NULL;
-       char buf[BUF_SIZE];
-       char *label, *level, *cat, *ptr;
-       long int val;
-       int i;
-       int newfd;
-
-       newfd = dup(fd);
-       if (newfd == -1)
-               return NULL;
-
-       file = fdopen(newfd, "r");
-       if (file == NULL) {
-               close(newfd);
-               return NULL;
-       }
-
-       cipso = calloc(sizeof(struct cipso), 1);
-       if (cipso == NULL) {
-               fclose(file);
-               return NULL;
-       }
-
-       while (fgets(buf, BUF_SIZE, file) != NULL) {
-               mapping = calloc(sizeof(struct cipso_mapping), 1);
-               if (mapping == NULL)
-                       goto err_out;
-
-               label = strtok_r(buf, " \t\n", &ptr);
-               level = strtok_r(NULL, " \t\n", &ptr);
-               cat = strtok_r(NULL, " \t\n", &ptr);
-               if (label == NULL || cat == NULL || level == NULL ||
-                   strlen(label) > LABEL_LEN) {
-                       errno = EINVAL;
-                       goto err_out;
-               }
-
-               strcpy(mapping->label, label);
-
-               errno = 0;
-               val = strtol(level, NULL, 10);
-               if (errno)
-                       goto err_out;
-
-               if (val < 0 || val > LEVEL_MAX) {
-                       errno = ERANGE;
-                       goto err_out;
-               }
-
-               mapping->level = val;
-
-               for (i = 0; i < CAT_MAX_COUNT && cat != NULL; i++) {
-                       errno = 0;
-                       val = strtol(cat, NULL, 10);
-                       if (errno)
-                               goto err_out;
-
-                       if (val < 0 || val > CAT_MAX_VALUE) {
-                               errno = ERANGE;
-                               goto err_out;
-                       }
-
-                       mapping->cats[i] = val;
-
-                       cat = strtok_r(NULL, " \t\n", &ptr);
-               }
-
-               mapping->ncats = i;
-
-               if (cipso->first == NULL) {
-                       cipso->first = cipso->last = mapping;
-               } else {
-                       cipso->last->next = mapping;
-                       cipso->last = mapping;
-               }
-       }
-
-       if (ferror(file))
-               goto err_out;
-
-       fclose(file);
-       return cipso;
-err_out:
-       fclose(file);
-       cipso_free(cipso);
-       free(mapping);
-       return NULL;
-}
-
-static void cipso_free(struct cipso *cipso)
-{
-       if (cipso == NULL)
-               return;
-
-       struct cipso_mapping *mapping = cipso->first;
-       struct cipso_mapping *next_mapping = NULL;
-
-       while (mapping != NULL) {
-               next_mapping = mapping->next;
-               free(mapping);
-               mapping = next_mapping;
-       }
-}
-
-static int cipso_apply(struct cipso *cipso)
-{
-       struct cipso_mapping *m = NULL;
-       char buf[CIPSO_MAX_SIZE];
-       int fd;
-       int i;
-
-       fd = open(SMACKFS_MNT "/cipso2", O_WRONLY);
-       if (fd < 0)
-               return -1;
-
-       for (m = cipso->first; m != NULL; m = m->next) {
-               sprintf(buf, "%s ", m->label);
-               sprintf(&buf[LABEL_LEN + 1], CIPSO_NUM_LEN_STR, m->level);
-               sprintf(&buf[LABEL_LEN + 1 + NUM_LEN], CIPSO_NUM_LEN_STR, m->ncats);
-
-               for (i = 0; i < m->ncats; i++)
-                       sprintf(&buf[CIPSO_POS(i)], CIPSO_NUM_LEN_STR, m->cats[i]);
-
-               if (write(fd, buf, strlen(buf)) < 0) {
-                       close(fd);
-                       return -1;
-               }
-       }
-
-       close(fd);
-       return 0;
-}