Changeset 4812

Timestamp:

09/30/08 14:46:33 (2 months ago)

Author:

jmowery

Message:

fix the typeattribute statement handling for optionals; this fixes the problem with rules using attributes with type sets modified within an optional

Files:

• branches/setools-devel/libqpol/src/policy.c (modified) (4 diffs)

branches/setools-devel/libqpol/src/policy.c

@@ -563 +563 @@
-}
-
-roles
+attributes, roles,
- *  union the relevant sets of types and roles from each declaration.
- *  @param policy The policy containig the symbols to union.
@@ -571 +571 @@
-static int union_multiply_declared_symbols(qpol_policy_t * policy) {
-        /* general structure of this function:
-
+/attribute
-                get datum from symtab, get key from array
-                look up symbol in scope table
@@ -579 +579 @@
-        qpol_iterator_t * iter = NULL;
-        int error = 0;
+        if (qpol_policy_get_type_iter(policy, &iter)) {
+                return 1;
+        }
+        for (; !qpol_iterator_end(iter); qpol_iterator_next(iter)) {
+                type_datum_t *attr;
+                if (qpol_iterator_get_item(iter, (void**)&attr)) {
+                        error = errno;
+                        goto err;
+                }
+                unsigned char isattr = 0;
+                if (qpol_type_get_isattr(policy, attr, &isattr)) {
+                        error = errno;
+                        goto err;
+                }
+                if (!isattr)
+                        continue;
+                const char *name;
+                if (qpol_type_get_name(policy, (qpol_type_t*)attr, &name)) {
+                        error = errno;
+                        goto err;
+                }
+                policydb_t *db = &policy->p->p;
+                avrule_block_t *blk = db->global;
+                for (; blk; blk = blk->next) {
+                        avrule_decl_t *decl = blk->enabled;
+                        if (!decl)
+                                continue; /* disabled */
+                        type_datum_t *internal_datum = hashtab_search(decl->symtab[SYM_TYPES].table, (const hashtab_key_t)name);
+                        if (internal_datum == NULL) {
+                                continue; /* not declared here */
+                        }
+                        if (ebitmap_union(&attr->types, &internal_datum->types))
+                        {
+                                error = errno;
+                                ERR(policy, "could not merge declarations for attribute %s", name);
+                                goto err;
+                        }
+                }
+        }
+        qpol_iterator_destroy(&iter);
+
+        /* repeat for roles */
-        if (qpol_policy_get_role_iter(policy, &iter)) {
-                return 1;
@@ -644 +686 @@
-                        if (db->decl_val_to_struct[scope_datum->decl_ids[i] - 1]->enabled == 0)
-                                continue; /* block is disabled */
-
+ -1 
-                        if (internal_datum == NULL) {
-                                continue; /* not declared here */